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

« no previous file with comments | « chrome/browser/ui/search_engines/template_url_table_model.cc ('k') | chrome/browser/ui/toolbar/back_forward_menu_model.cc » ('j') | ui/base/models/table_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 0c8cf5492b20c216e60e863fbb2068392ff183c6..3655fbe380020213183ad36f2be39469a2d7a137 100644

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

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

@@ -17,13 +17,16 @@

#include "webkit/glue/window_open_disposition.h"

class Browser;

-class SkBitmap;

namespace content {

class NavigationEntry;

class WebContents;

}

+namespace gfx {

+class ImageSkia;

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

// BackForwardMenuModel

@@ -58,7 +61,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, SkBitmap* icon) OVERRIDE;

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

virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(

int index) const OVERRIDE;

virtual bool IsEnabledAt(int index) const OVERRIDE;