chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm - Issue 10453101: Convert most of the rest of chrome 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/extensions/extension_install_dialog_controller.mm

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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/extensions/extension_install_dialog_controller.h ('k') | chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 504edb9350e238b15e819074fb1bd07a49963f93..809c575cb277684423e01a310a8ed7d2f4651c88 100644

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

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

@@ -30,7 +30,7 @@ using extensions::BundleInstaller;

@interface ExtensionInstallDialogController ()

- (BOOL)isBundleInstall;

- (BOOL)isInlineInstall;

-- (void)appendRatingStar:(const SkBitmap*)skiaImage;

+- (void)appendRatingStar:(const gfx::ImageSkia*)skiaImage;

@end

namespace {

@@ -66,7 +66,7 @@ void OffsetControlVerticallyToFitContent(NSControl* control,

[control setFrameOrigin:origin];

}

-void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) {

+void AppendRatingStarsShim(const gfx::ImageSkia* skiaImage, void* data) {

ExtensionInstallDialogController* controller =

static_cast<ExtensionInstallDialogController*>(data);

[controller appendRatingStar:skiaImage];

@@ -297,7 +297,7 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) {

return prompt_->type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT;

}

-- (void)appendRatingStar:(const SkBitmap*)skiaImage {

+- (void)appendRatingStar:(const gfx::ImageSkia*)skiaImage {

NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(

*skiaImage, base::mac::GetSystemColorSpace());

NSRect frame = NSMakeRect(0, 0, skiaImage->width(), skiaImage->height());