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

Unified Diff: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 7 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
Index: chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
index 16b8863abe4e94894811462e7463f77c2b3c823c..9a6c508d7158651829bb4e043fb2c5e07e046fd1 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
@@ -307,10 +307,10 @@ const SkBitmap* AutocompleteResultView::GetIcon() const {
return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(icon);
}
-const SkBitmap* AutocompleteResultView::GetKeywordIcon() const {
+const gfx::ImageSkia* AutocompleteResultView::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().GetBitmapNamed(
+ return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
(GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS);
}
@@ -638,4 +638,3 @@ void AutocompleteResultView::AnimationProgressed(
Layout();
SchedulePaint();
}
-
« no previous file with comments | « chrome/browser/ui/views/autocomplete/autocomplete_result_view.h ('k') | chrome/browser/ui/views/avatar_menu_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698