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

Unified Diff: chrome/browser/ui/toolbar/back_forward_menu_model.cc

Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to 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/toolbar/back_forward_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
index de085cf9f8cf9d8c2eb2958ba410f5fb470ebb31..84d18b33654d8c61867d91e10386c87822b4b91e 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -131,12 +131,12 @@ int BackForwardMenuModel::GetGroupIdAt(int index) const {
return false;
}
-bool BackForwardMenuModel::GetIconAt(int index, SkBitmap* icon) {
+bool BackForwardMenuModel::GetIconAt(int index, gfx::ImageSkia* icon) {
if (!ItemHasIcon(index))
return false;
if (index == GetItemCount() - 1) {
- *icon = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ *icon = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_HISTORY_FAVICON);
} else {
NavigationEntry* entry = GetNavigationEntry(index);

Powered by Google App Engine
This is Rietveld 408576698