linux_aura: Use the correct tinted icons when in gtk+ theme mode.

BUG=130810

Review URL: https://codereview.chromium.org/14270006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194442 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -709,9 +709,8 @@ void LocationBarView::Layout() {
         selected_keyword_view_->SetImage(image.AsImageSkia());
         selected_keyword_view_->set_is_extension_icon(true);
       } else {
-        ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
         selected_keyword_view_->SetImage(
-            *rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
+            *(GetThemeProvider()->GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)));
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
@@ -1010,8 +1009,7 @@ void LocationBarView::OnAutocompleteAccept(
 
 void LocationBarView::OnChanged() {
   location_icon_view_->SetImage(
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          location_entry_->GetIcon()));
+      GetThemeProvider()->GetImageSkiaNamed(location_entry_->GetIcon()));
   location_icon_view_->ShowTooltip(!GetLocationEntry()->IsEditingOrEmpty());
 
   Layout();

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

@@ -387,7 +387,7 @@ OmniboxResultView* OmniboxPopupContentsView::CreateResultView(
     OmniboxResultViewModel* model,
     int model_index,
     const gfx::Font& font) {
-  return new OmniboxResultView(model, model_index, font);
+  return new OmniboxResultView(model, model_index, location_bar_, font);
 }
 
 ////////////////////////////////////////////////////////////////////////////////

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h

@@ -81,6 +81,8 @@ class OmniboxPopupContentsView : public views::View,
                            views::View* location_bar);
   virtual ~OmniboxPopupContentsView();
 
+  views::View* location_bar() { return location_bar_; }
+
   virtual void PaintResultViews(gfx::Canvas* canvas);
 
   // Calculates the height needed to show all the results in the model.

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

@@ -21,10 +21,11 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
+#include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/render_text.h"
 #include "ui/native_theme/native_theme.h"
 
@@ -105,12 +106,14 @@ class OmniboxResultView::MirroringContext {
 OmniboxResultView::OmniboxResultView(
     OmniboxResultViewModel* model,
     int model_index,
+    views::View* location_bar,
     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),
       font_(font),
       font_height_(std::max(font.GetHeight(),
                             font.DeriveFont(0, gfx::BOLD).GetHeight())),
@@ -122,7 +125,7 @@ OmniboxResultView::OmniboxResultView(
   CHECK_GE(model_index, 0);
   if (default_icon_size_ == 0) {
     default_icon_size_ =
-        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+        location_bar_->GetThemeProvider()->GetImageSkiaNamed(
         AutocompleteMatch::TypeToIcon(AutocompleteMatch::URL_WHAT_YOU_TYPED))->
         width();
   }
@@ -323,13 +326,13 @@ gfx::ImageSkia OmniboxResultView::GetIcon() const {
         break;
     }
   }
-  return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon);
+  return *(location_bar_->GetThemeProvider()->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 ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+  return location_bar_->GetThemeProvider()->GetImageSkiaNamed(
       (GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS);
 }
 

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

@@ -46,6 +46,7 @@ class OmniboxResultView : public views::View,
 
   OmniboxResultView(OmniboxResultViewModel* model,
                     int model_index,
+                    views::View* location_bar,
                     const gfx::Font& font);
   virtual ~OmniboxResultView();
 
@@ -144,6 +145,8 @@ class OmniboxResultView : public views::View,
   OmniboxResultViewModel* model_;
   size_t model_index_;
 
+  views::View* location_bar_;
+
   const gfx::Font font_;
   int font_height_;
 

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

@@ -17,8 +17,9 @@
 
 TouchOmniboxResultView::TouchOmniboxResultView(OmniboxResultViewModel* model,
                                                int model_index,
+                                               views::View* location_bar,
                                                const gfx::Font& font)
-    : OmniboxResultView(model, model_index, font) {
+    : OmniboxResultView(model, model_index, location_bar, font) {
   set_edge_item_padding(8);
   set_item_padding(8);
   set_minimum_text_vertical_padding(10);
@@ -99,7 +100,7 @@ OmniboxResultView* TouchOmniboxPopupContentsView::CreateResultView(
     OmniboxResultViewModel* model,
     int model_index,
     const gfx::Font& font) {
-  return new TouchOmniboxResultView(model, model_index, font);
+  return new TouchOmniboxResultView(model, model_index, location_bar(), font);
 }
 
 std::vector<views::View*> TouchOmniboxPopupContentsView::GetVisibleChildren() {

chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h

@@ -24,6 +24,7 @@ class TouchOmniboxResultView : public OmniboxResultView {
  public:
   TouchOmniboxResultView(OmniboxResultViewModel* model,
                          int model_index,
+                         views::View* location_bar,
                          const gfx::Font& font);
 
  private: