chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.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/toolbar/back_forward_menu_controller.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

Index: chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm

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

index 97a6e52a7f8dd31df0ad43279ef562db36c7e564..7e7311cb3ad8b8d6bcd53d68ca80d69f0f152c20 100644

--- a/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm

+++ b/chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.mm

@@ -12,6 +12,7 @@

#include "chrome/browser/ui/toolbar/back_forward_menu_model.h"

#include "skia/ext/skia_utils_mac.h"

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

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

using base::SysUTF16ToNSString;

using gfx::SkBitmapToNSImage;

@@ -71,10 +72,10 @@ using gfx::SkBitmapToNSImage;

keyEquivalent:@""];

[menuItem autorelease];

- SkBitmap icon;

+ gfx::ImageSkia icon;

// Icon (if it has one).

if (model_->GetIconAt(menuID, &icon))

- [menuItem setImage:SkBitmapToNSImage(icon)];

+ [menuItem setImage:SkBitmapToNSImage(*icon.bitmap())];

// This will make it call our |-executeMenuItem:| method. We store the

// |menuID| (or |menu_id|) in the tag.

« no previous file with comments | « chrome/browser/ui/cocoa/menu_controller_unittest.mm ('k') | chrome/browser/ui/gtk/gtk_tree.cc » ('j') | ui/base/models/table_model.cc » ('J')