ui/views/controls/menu/menu_win.h - Issue 10437006: Converts ui/views/controls, ui/views/examples, ui/base/models to 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: ui/views/controls/menu/menu_win.h

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

« ui/views/controls/button/text_button.h ('K') | « ui/views/controls/menu/menu_model_adapter_unittest.cc ('k') | ui/views/controls/menu/menu_win.cc » ('j') | ui/views/controls/menu/native_menu_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/menu/menu_win.h

diff --git a/ui/views/controls/menu/menu_win.h b/ui/views/controls/menu/menu_win.h

index 3b20f276c0fa6a54a90d604ccbb9073fbb8c7d7c..16f9cb4af1ea8f28b12c8db02c426d8552da920a 100644

--- a/ui/views/controls/menu/menu_win.h

+++ b/ui/views/controls/menu/menu_win.h

@@ -50,16 +50,16 @@ class MenuWin : public Menu {

virtual void AddMenuItemWithIcon(int index,

int item_id,

const string16& label,

- const SkBitmap& icon) OVERRIDE;

+ const gfx::ImageSkia& icon) OVERRIDE;

virtual Menu* AddSubMenuWithIcon(int index,

int item_id,

const string16& label,

- const SkBitmap& icon) OVERRIDE;

+ const gfx::ImageSkia& icon) OVERRIDE;

virtual void AddSeparator(int index) OVERRIDE;

virtual void EnableMenuItemByID(int item_id, bool enabled) OVERRIDE;

virtual void EnableMenuItemAt(int index, bool enabled) OVERRIDE;

virtual void SetMenuLabel(int item_id, const string16& label) OVERRIDE;

- virtual bool SetIcon(const SkBitmap& icon, int item_id) OVERRIDE;

+ virtual bool SetIcon(const gfx::ImageSkia& icon, int item_id) OVERRIDE;

virtual void RunMenuAt(int x, int y) OVERRIDE;

virtual void Cancel() OVERRIDE;

virtual int ItemCount() OVERRIDE;

@@ -75,7 +75,7 @@ class MenuWin : public Menu {

virtual void AddMenuItemInternal(int index,

int item_id,

const string16& label,

- const SkBitmap& icon,

+ const gfx::ImageSkia& icon,

MenuItemType type) OVERRIDE;

private:

@@ -87,7 +87,7 @@ class MenuWin : public Menu {

void AddMenuItemInternal(int index,

int item_id,

const string16& label,

- const SkBitmap& icon,

+ const gfx::ImageSkia& icon,

HMENU submenu,

MenuItemType type);