Restyle omnibox popup

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 88 matching lines @@
  private:
   int center_;
   int right_;
 
   DISALLOW_COPY_AND_ASSIGN(MirroringContext);
 };
 
 OmniboxResultView::OmniboxResultView(
     OmniboxResultViewModel* model,
     int model_index,
-    views::View* location_bar,
+    OmniboxViewDelegate* view_delegate,
     const gfx::Font& font)
     : edge_item_padding_(LocationBarView::GetItemPadding()),
       item_padding_(LocationBarView::GetItemPadding()),
       minimum_text_vertical_padding_(kMinimumTextVerticalPadding),
       model_(model),
       model_index_(model_index),
-      location_bar_(location_bar),
+      view_delegate_(view_delegate),
       font_(font),
       font_height_(std::max(font.GetHeight(),
                             font.DeriveFont(0, gfx::BOLD).GetHeight())),
       ellipsis_width_(font.GetStringWidth(string16(kEllipsis))),
       mirroring_context_(new MirroringContext()),
       keyword_icon_(new views::ImageView()),
       animation_(new ui::SlideAnimation(this)) {
   CHECK_GE(model_index, 0);
   if (default_icon_size_ == 0) {
     default_icon_size_ =
-        location_bar_->GetThemeProvider()->GetImageSkiaNamed(
+        view_delegate_->GetThemeProviderForPopup()->GetImageSkiaNamed(
             AutocompleteMatch::TypeToIcon(
                 AutocompleteMatchType::URL_WHAT_YOU_TYPED))->width();
   }
   keyword_icon_->set_owned_by_client();
   keyword_icon_->EnableCanvasFlippingForRTLUI(true);
   keyword_icon_->SetImage(GetKeywordIcon());
   keyword_icon_->SizeToPreferredSize();
 }
 
 OmniboxResultView::~OmniboxResultView() {
@@ skipping 102 matching lines @@
     classifications.push_back(
         ACMatchClassification(0, ACMatchClassification::NONE));
     x = DrawString(canvas, separator, classifications, true, x,
                    text_bounds_.y());
 
     DrawString(canvas, match.description, match.description_class, true, x,
                text_bounds_.y());
   }
 }
 
 int OmniboxResultView::GetTextHeight() const {

[Peter Kasting, 2013/06/06 18:52:16]

Nit: Move this definition up to continue to match the header declaration order

   return font_height_;
 }
 
 // static
 void OmniboxResultView::CommonInitColors(const ui::NativeTheme* theme,
                                          SkColor colors[][NUM_KINDS]) {
   colors[HOVERED][BACKGROUND] =
       color_utils::AlphaBlend(colors[SELECTED][BACKGROUND],
                               colors[NORMAL][BACKGROUND], 64);
   colors[HOVERED][TEXT] = colors[NORMAL][TEXT];
@@ skipping 57 matching lines @@
         icon = IDR_OMNIBOX_SEARCH_SELECTED;
         break;
       case IDR_OMNIBOX_STAR:
         icon = IDR_OMNIBOX_STAR_SELECTED;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
-  return *(location_bar_->GetThemeProvider()->GetImageSkiaNamed(icon));
+  return *(view_delegate_->GetThemeProviderForPopup()->GetImageSkiaNamed(icon));
 }
 
 const gfx::ImageSkia* OmniboxResultView::GetKeywordIcon() const {
   // NOTE: If we ever begin returning icons of varying size, then callers need
   // to ensure that |keyword_icon_| is resized each time its image is reset.
-  return location_bar_->GetThemeProvider()->GetImageSkiaNamed(
+  return view_delegate_->GetThemeProviderForPopup()->GetImageSkiaNamed(
       (GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS);
 }
 
 int OmniboxResultView::DrawString(
     gfx::Canvas* canvas,
     const string16& text,
     const ACMatchClassifications& classifications,
     bool force_dim,
     int x,
     int y) {
@@ skipping 278 matching lines @@
     int x = GetMirroredXForRect(keyword_text_bounds_);
     mirroring_context_->Initialize(x, keyword_text_bounds_.width());
     PaintMatch(canvas, *match_.associated_keyword.get(), x);
   }
 }
 
 void OmniboxResultView::AnimationProgressed(const ui::Animation* animation) {
   Layout();
   SchedulePaint();
 }