diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm | 22 |
1 files changed, 16 insertions, 6 deletions
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 b9b3046..445fc60 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -83,7 +83,9 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { - (id)initWithParentWindow:(NSWindow*)window profile:(Profile*)profile + extension:(const Extension*)extension delegate:(ExtensionInstallUI::Delegate*)delegate + icon:(SkBitmap*)icon prompt:(const ExtensionInstallUI::Prompt&)prompt { NSString* nibpath = nil; @@ -107,7 +109,9 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { if ((self = [super initWithWindowNibPath:nibpath owner:self])) { parentWindow_ = window; profile_ = profile; + icon_ = *icon; delegate_ = delegate; + extension_ = extension; prompt_.reset(new ExtensionInstallUI::Prompt(prompt)); } return self; @@ -122,8 +126,8 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { } - (IBAction)storeLinkClicked:(id)sender { - GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() + - prompt_->extension()->id()); + GURL store_url( + extension_urls::GetWebstoreItemDetailURLPrefix() + extension_->id()); BrowserList::GetLastActiveWithProfile(profile_)->OpenURL(OpenURLParams( store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false)); @@ -148,7 +152,8 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { [[self window] delegate])); // Set control labels. - [titleField_ setStringValue:base::SysUTF16ToNSString(prompt_->GetHeading())]; + [titleField_ setStringValue:base::SysUTF16ToNSString( + prompt_->GetHeading(extension_->name()))]; [okButton_ setTitle:base::SysUTF16ToNSString( prompt_->GetAcceptButtonLabel())]; [cancelButton_ setTitle:prompt_->HasAbortButtonLabel() ? @@ -162,7 +167,8 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { prompt_->GetUserCount())]; } - [iconView_ setImage:prompt_->icon().ToNSImage()]; + NSImage* image = gfx::SkBitmapToNSImage(icon_); + [iconView_ setImage:image]; // Resize |titleField_| to fit the title. CGFloat originalTitleWidth = [titleField_ frame].size.width; @@ -192,7 +198,7 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { // If there are any warnings, then we have to do some special layout. if (prompt_->GetPermissionCount() > 0) { [subtitleField_ setStringValue:base::SysUTF16ToNSString( - prompt_->GetPermissionsHeading())]; + prompt_->GetPermissionsHeader())]; // We display the permission warnings as a simple text string, separated by // newlines. @@ -289,6 +295,8 @@ void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) { void ShowExtensionInstallDialogImpl( Profile* profile, ExtensionInstallUI::Delegate* delegate, + const Extension* extension, + SkBitmap* icon, const ExtensionInstallUI::Prompt& prompt) { Browser* browser = BrowserList::GetLastActiveWithProfile(profile); if (!browser) { @@ -308,7 +316,9 @@ void ShowExtensionInstallDialogImpl( [[ExtensionInstallDialogController alloc] initWithParentWindow:native_window profile:profile + extension:extension delegate:delegate + icon:icon prompt:prompt]; // TODO(mihaip): Switch this to be tab-modal (http://crbug.com/95455) |