chrome/browser/ui/cocoa/menu_controller_unittest.mm - 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/cocoa/menu_controller_unittest.mm

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/cocoa/menu_controller.mm ('k') | chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm » ('j') | ui/base/models/table_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/menu_controller_unittest.mm

diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm

index d8385318d3ef92a72c61109ea3101e93465a46e7..4ac987bb3e865c917475a2a7e9a0456fa9b53b3e 100644

--- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm

+++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm

@@ -14,6 +14,7 @@

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/base/models/simple_menu_model.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/gfx/image/image_skia.h"

class MenuControllerTest : public CocoaTest {

};

@@ -75,7 +76,7 @@ class DynamicDelegate : public Delegate {

DynamicDelegate() : icon_(NULL) {}

virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; }

virtual string16 GetLabelForCommandId(int command_id) const { return label_; }

- virtual bool GetIconForCommandId(int command_id, SkBitmap* icon) const {

+ virtual bool GetIconForCommandId(int command_id, gfx::ImageSkia* icon) const {

if (icon_) {

*icon = *icon_;

return true;