chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm - Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap.

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/extensions/extension_uninstall_dialog_cocoa.mm

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

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

index 869f22069aa6f4ef7e781d6b30cab32d1fc75f5f..dc70915755cad7e4046278179a959ababa92a231 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm

@@ -16,6 +16,7 @@

#include "skia/ext/skia_utils_mac.h"

#include "ui/base/l10n/l10n_util_mac.h"

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

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

namespace {

@@ -55,7 +56,7 @@ void ExtensionUninstallDialogCocoa::Show() {

IDS_EXTENSION_UNINSTALL_PROMPT_HEADING,

UTF8ToUTF16(extension_->name()))];

[alert setAlertStyle:NSWarningAlertStyle];

- [alert setIcon:gfx::SkBitmapToNSImage(icon_)];

+ [alert setIcon:gfx::NSImageFromImageSkia(icon_)];

if ([alert runModal] == NSAlertFirstButtonReturn)

delegate_->ExtensionUninstallAccepted();

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm ('k') | skia/ext/skia_utils_mac.h » ('j') | no next file with comments »