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

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: 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 6e891323727ec39febe68eaa50d26f3323e6c39d..91e3cd3848be3944464b0055c68c4f29a0d531cd 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_result_view.cc
@@ -298,10 +298,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);
}
@@ -606,4 +606,3 @@ void AutocompleteResultView::AnimationProgressed(
Layout();
SchedulePaint();
}
-

Powered by Google App Engine
This is Rietveld 408576698