Fix Spacing in OmniboxResultView

chrome/browser/ui/views/omnibox/omnibox_result_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 337 matching lines @@
 
   if (description_max_width != 0) {
     if (match.answer) {
       y += GetContentLineHeight();
       if (!answer_image_.isNull()) {
         int answer_icon_size = GetAnswerLineHeight();
         canvas->DrawImageInt(
             answer_image_,
             0, 0, answer_image_.width(), answer_image_.height(),
             GetMirroredXInView(x), y, answer_icon_size, answer_icon_size, true);
+        // See TODO in Layout().
         x += answer_icon_size +
-             GetThemeProvider()->GetDisplayProperty(
+             location_bar_view_->GetThemeProvider()->GetDisplayProperty(
                  ThemeProperties::PROPERTY_ICON_LABEL_VIEW_TRAILING_PADDING);
       }
     } else {
       x = DrawRenderText(match, separator_rendertext_.get(), false, canvas,
                          after_contents_x, y, separator_width_);
     }
 
     DrawRenderText(match, description, false, canvas, x, y,
                    description_max_width);
   }
@@ skipping 231 matching lines @@
 void OmniboxResultView::InitContentsRenderTextIfNecessary() const {
   if (!contents_rendertext_) {
     contents_rendertext_.reset(
         CreateClassifiedRenderText(
             match_.contents, match_.contents_class, false).release());
   }
 }
 
 void OmniboxResultView::Layout() {
   const gfx::ImageSkia icon = GetIcon();
-  ui::ThemeProvider* theme_provider = GetThemeProvider();
+  // TODO(jonross): Currently |location_bar_view_| provides the correct
+  // ThemeProvider, as it is loaded on the BrowserFrame widget. The root widget
+  // for OmniboxResultView is AutocompletePopupWidget, which is not loading the
+  // theme. We should update the omnibox code to also track its own
+  // ThemeProvider in order to reduce dependancy on LocationBarView.
+  ui::ThemeProvider* theme_provider = location_bar_view_->GetThemeProvider();
   // |theme_provider| can be null when animations are running during shutdown,
   // after OmniboxResultView has been removed from the tree of Views.
   if (!theme_provider)
     return;
   const int horizontal_padding = theme_provider->GetDisplayProperty(
       ThemeProperties::PROPERTY_LOCATION_BAR_HORIZONTAL_PADDING);
   const int trailing_padding = theme_provider->GetDisplayProperty(
       ThemeProperties::PROPERTY_ICON_LABEL_VIEW_TRAILING_PADDING);
 
   icon_bounds_.SetRect(
@@ skipping 158 matching lines @@
   gfx::Range range(offset, offset + text.length());
   destination->AppendText(text);
   const TextStyle& text_style = GetTextStyle(text_type);
   // TODO(dschuyler): follow up on the problem of different font sizes within
   // one RenderText.  Maybe with destination->SetFontList(...).
   destination->ApplyStyle(gfx::BOLD, is_bold, range);
   destination->ApplyColor(
       GetNativeTheme()->GetSystemColor(text_style.colors[GetState()]), range);
   destination->ApplyBaselineStyle(text_style.baseline, range);
 }