Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2917)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 14270006: linux_aura: Use the correct tinted icons when in gtk+ theme mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 596a9f38cc4439cb2e6b0ddcbb3e843993491592..d2e11d29ef3b4e29fd3845a5ffed601fa57bdf0b 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/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();
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698