chrome/browser/ui/toolbar/back_forward_menu_model.h - 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/back_forward_menu_model.h

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/back_forward_menu_model.h

diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h

index 36ed0e5fd0e8113c55efeaad4c0cdcf21560f396..8145fb93e25ac843375de74b071c177510429ff7 100644

--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h

+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h

@@ -23,7 +23,7 @@ class WebContents;

}

namespace gfx {

-class ImageSkia;

+class Image;

}

///////////////////////////////////////////////////////////////////////////////

@@ -60,7 +60,7 @@ class BackForwardMenuModel : public ui::MenuModel {

ui::Accelerator* accelerator) const OVERRIDE;

virtual bool IsItemCheckedAt(int index) const OVERRIDE;

virtual int GetGroupIdAt(int index) const OVERRIDE;

- virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE;

+ virtual bool GetIconAt(int index, gfx::Image* icon) OVERRIDE;

virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(

int index) const OVERRIDE;

virtual bool IsEnabledAt(int index) const OVERRIDE;