chrome/browser/ui/toolbar/action_box_menu_model.cc - Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10824402: Convert ui::MenuModel to use gfx::Image instead of ImageSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Another day, another rebase Created 8 years, 4 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:

Index: chrome/browser/ui/toolbar/action_box_menu_model.cc

diff --git a/chrome/browser/ui/toolbar/action_box_menu_model.cc b/chrome/browser/ui/toolbar/action_box_menu_model.cc

index 7cd39853a4b7026fc8e7cbcaeeab8c73e500e894..fcd5a8580c8f55906aec83f2af18a58b12fe8678 100644

--- a/chrome/browser/ui/toolbar/action_box_menu_model.cc

+++ b/chrome/browser/ui/toolbar/action_box_menu_model.cc

@@ -33,10 +33,10 @@ ActionBoxMenuModel::ActionBoxMenuModel(Browser* browser,

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

InsertItemWithStringIdAt(0, IDC_CHROME_TO_MOBILE_PAGE,

IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP);

- SetIcon(0, *rb.GetImageSkiaNamed(IDR_MOBILE));

+ SetIcon(0, rb.GetNativeImageNamed(IDR_MOBILE));

InsertItemWithStringIdAt(1, IDC_BOOKMARK_PAGE,

starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR);

- SetIcon(1, *rb.GetImageSkiaNamed(starred ? IDR_STAR_LIT : IDR_STAR));

+ SetIcon(1, rb.GetNativeImageNamed(starred ? IDR_STAR_LIT : IDR_STAR));

// Adds extensions to the model.

int command_id = kFirstExtensionCommandId;