chrome/browser/ui/toolbar/wrench_menu_model.cc - Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use 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/wrench_menu_model.cc

Issue 10447053: Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Sorted headers in modified files 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

« ash/shell/content_client/shell_content_browser_client.cc ('K') | « chrome/browser/ui/panels/panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 11ac89db6815d649b0ad66a10dfcdbc9ecda8aab..68622989f134e530ad60d54173dfb66f84a1e70b 100644

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

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

@@ -286,7 +286,7 @@ bool WrenchMenuModel::GetIconForCommandId(int command_id,

switch (command_id) {

case IDC_UPGRADE_DIALOG: {

if (UpgradeDetector::GetInstance()->notify_upgrade()) {

- *icon = *rb.GetImageNamed(

+ *icon = *rb.GetNativeImageNamed(

UpgradeDetector::GetInstance()->GetIconResourceID(

UpgradeDetector::UPGRADE_ICON_TYPE_MENU_ICON)).ToImageSkia();

return true;

@@ -301,7 +301,7 @@ bool WrenchMenuModel::GetIconForCommandId(int command_id,

if (error && error->HasCustomizedSyncMenuItem()) {

int icon_id = error->MenuItemIconResourceID();

if (icon_id) {

- *icon = *rb.GetImageNamed(icon_id).ToImageSkia();

+ *icon = *rb.GetNativeImageNamed(icon_id).ToImageSkia();

return true;

}