Add GTK interface for installing bundles of extensions.

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

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 64 matching lines @@
 @synthesize warningsField = warningsField_;
 @synthesize cancelButton = cancelButton_;
 @synthesize okButton = okButton_;
 @synthesize warningsSeparator = warningsSeparator_;
 @synthesize ratingStars = ratingStars_;
 @synthesize ratingCountField = ratingCountField_;
 @synthesize userCountField = userCountField_;
 
 - (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;
 
   // We use a different XIB in the case of inline installs or no permission
   // warnings, that respectively show webstore ratings data and are a more
   // nicely laid out.
   if (prompt.type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT) {
     nibpath = [base::mac::FrameworkBundle()
                pathForResource:@"ExtensionInstallPromptInline"
                         ofType:@"nib"];
   } else if (prompt.GetPermissionCount() == 0) {
     nibpath = [base::mac::FrameworkBundle()
                pathForResource:@"ExtensionInstallPromptNoWarnings"
                         ofType:@"nib"];
   } else {
    nibpath = [base::mac::FrameworkBundle()
               pathForResource:@"ExtensionInstallPrompt"
                        ofType:@"nib"];
   }
 
   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;
 }
 
 - (void)runAsModalSheet {
   [NSApp beginSheet:[self window]
      modalForWindow:parentWindow_
       modalDelegate:self
      didEndSelector:@selector(didEndSheet:returnCode:contextInfo:)
         contextInfo:nil];
 }
 
 - (IBAction)storeLinkClicked:(id)sender {
-  GURL store_url(
-      extension_urls::GetWebstoreItemDetailURLPrefix() + extension_->id());
+  GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() +
+                 prompt_->extension()->id());
   BrowserList::GetLastActiveWithProfile(profile_)->OpenURL(OpenURLParams(
       store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
       false));
 
   delegate_->InstallUIAbort(/*user_initiated=*/true);
   [NSApp endSheet:[self window]];
 }
 
 - (IBAction)cancel:(id)sender {
   delegate_->InstallUIAbort(/*user_initiated=*/true);
   [NSApp endSheet:[self window]];
 }
 
 - (IBAction)ok:(id)sender {
   delegate_->InstallUIProceed();
   [NSApp endSheet:[self window]];
 }
 
 - (void)awakeFromNib {
   // Make sure we're the window's delegate as set in the nib.
   DCHECK_EQ(self, static_cast<ExtensionInstallDialogController*>(
                       [[self window] delegate]));
 
   // Set control labels.
   [titleField_ setStringValue:base::SysUTF16ToNSString(

[Robert Sesek, 2012/02/23 20:12:32]

Can you re-wrap this line?

[jstritar, 2012/02/24 18:21:46]

Done.

-      prompt_->GetHeading(extension_->name()))];
+      prompt_->GetHeading())];
   [okButton_ setTitle:base::SysUTF16ToNSString(
       prompt_->GetAcceptButtonLabel())];
   [cancelButton_ setTitle:prompt_->HasAbortButtonLabel() ?
       base::SysUTF16ToNSString(prompt_->GetAbortButtonLabel()) :
       l10n_util::GetNSString(IDS_CANCEL)];
   if ([self isInlineInstall]) {
     prompt_->AppendRatingStars(AppendRatingStarsShim, self);
     [ratingCountField_ setStringValue:base::SysUTF16ToNSString(
         prompt_->GetRatingCount())];
     [userCountField_ setStringValue:base::SysUTF16ToNSString(
         prompt_->GetUserCount())];
   }
 
-  NSImage* image = gfx::SkBitmapToNSImage(icon_);
+  NSImage* image = gfx::SkBitmapToNSImage(prompt_->icon());
   [iconView_ setImage:image];
 
   // Resize |titleField_| to fit the title.
   CGFloat originalTitleWidth = [titleField_ frame].size.width;
   [titleField_ sizeToFit];
   CGFloat newTitleWidth = [titleField_ frame].size.width;
   if (newTitleWidth > originalTitleWidth) {
     NSRect frame = [[self window] frame];
     frame.size.width += newTitleWidth - originalTitleWidth;
     [[self window] setFrame:frame display:NO];
@@ skipping 10 matching lines @@
   buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
   if (buttonDelta.width) {
     [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
                                          -buttonDelta.width, 0)];
   }
 
   CGFloat totalOffset = 0.0;
   // If there are any warnings, then we have to do some special layout.
   if (prompt_->GetPermissionCount() > 0) {
     [subtitleField_ setStringValue:base::SysUTF16ToNSString(
-        prompt_->GetPermissionsHeader())];
+        prompt_->GetPermissionsHeading())];
 
     // We display the permission warnings as a simple text string, separated by
     // newlines.
     NSMutableString* joinedWarnings = [NSMutableString string];
     for (size_t i = 0; i < prompt_->GetPermissionCount(); ++i) {
       if (i > 0)
         [joinedWarnings appendString:@"\n"];
       [joinedWarnings appendString:base::SysUTF16ToNSString(
           prompt_->GetPermission(i))];
     }
@@ skipping 76 matching lines @@
                                  skiaImage->width(), skiaImage->height());
   [view setFrame:starBounds];
   [ratingStars_ addSubview:view];
 }
 
 @end  // ExtensionInstallDialogController
 
 void ShowExtensionInstallDialogImpl(
     Profile* profile,
     ExtensionInstallUI::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* icon,
     const ExtensionInstallUI::Prompt& prompt) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
   if (!browser) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   BrowserWindow* window = browser->window();
   if (!window) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   gfx::NativeWindow native_window = window->GetNativeHandle();
 
   ExtensionInstallDialogController* controller =
       [[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)
   [controller runAsModalSheet];
 }