Add Mac interface for installing bundles of extensions.

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

 // 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/i18n/rtl.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"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using content::OpenURLParams;
 using content::Referrer;
+using extensions::BundleInstaller;
 
 @interface ExtensionInstallDialogController ()
-- (bool)isInlineInstall;
+- (BOOL)isBundleInstall;
+- (BOOL)isInlineInstall;
 - (void)appendRatingStar:(const SkBitmap*)skiaImage;
 @end
 
 namespace {
 
 // Padding above the warnings separator, we must also subtract this when hiding
 // it.
 const CGFloat kWarningsSeparatorPadding = 14;
 
 // Maximum height we will adjust controls to when trying to accomodate their
 // contents.
 const CGFloat kMaxControlHeight = 400;
 
-// Adjust a control's height so that its content its not clipped. Returns the
-// amount the control's height had to be adjusted.

[Robert Sesek, 2012/02/27 18:59:20]

Why remove this comment?

[jstritar, 2012/03/05 18:05:08]

Updated the comment.

-CGFloat AdjustControlHeightToFitContent(NSControl* control) {
+void OffsetControlVerticallyToFitContent(NSControl* control,
+                                         CGFloat* totalOffset) {
+  // Adjust the control's height so that its content is not clipped.
   NSRect currentRect = [control frame];
   NSRect fitRect = currentRect;
   fitRect.size.height = kMaxControlHeight;
   CGFloat desiredHeight = [[control cell] cellSizeForBounds:fitRect].height;
   CGFloat offset = desiredHeight - currentRect.size.height;
 
   [control setFrameSize:NSMakeSize(currentRect.size.width,
                                    currentRect.size.height + offset)];
-  return offset;
-}
 
-// Moves the control vertically by the specified amount.
-void OffsetControlVertically(NSControl* control, CGFloat amount) {
+  *totalOffset += offset;
+
+  // Move the control vertically by the new total offset.
   NSPoint origin = [control frame].origin;
-  origin.y += amount;
+  origin.y -= *totalOffset;
   [control setFrameOrigin:origin];
 }
 
 void AppendRatingStarsShim(const SkBitmap* skiaImage, void* data) {
   ExtensionInstallDialogController* controller =
       static_cast<ExtensionInstallDialogController*>(data);
   [controller appendRatingStar:skiaImage];
 }
 
 }
 
 @implementation ExtensionInstallDialogController
 
 @synthesize iconView = iconView_;
 @synthesize titleField = titleField_;
+@synthesize itemsField = itemsField_;
 @synthesize subtitleField = subtitleField_;
 @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
                   delegate:(ExtensionInstallUI::Delegate*)delegate
                     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 if (prompt.type() == ExtensionInstallUI::BUNDLE_INSTALL_PROMPT) {
+    nibpath = [base::mac::FrameworkBundle()
+               pathForResource:@"ExtensionInstallPromptBundle"
+                        ofType:@"nib"];
   } else {
    nibpath = [base::mac::FrameworkBundle()
               pathForResource:@"ExtensionInstallPrompt"
                        ofType:@"nib"];
   }
 
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     parentWindow_ = window;
     profile_ = profile;
     delegate_ = delegate;
@@ skipping 44 matching lines @@
       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())];
   }
 
-  [iconView_ setImage:prompt_->icon().ToNSImage()];
+  // The bundle install dialog has no icon.
+  if (![self isBundleInstall])
+    [iconView_ setImage:prompt_->icon().ToNSImage()];
 
   // 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];
   }
 
   // Resize |okButton_| and |cancelButton_| to fit the button labels, but keep
   // them right-aligned.
   NSSize buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:okButton_];
   if (buttonDelta.width) {
     [okButton_ setFrame:NSOffsetRect([okButton_ frame], -buttonDelta.width, 0)];
     [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
                                          -buttonDelta.width, 0)];
   }
   buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
   if (buttonDelta.width) {
     [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
                                          -buttonDelta.width, 0)];
   }
 
+  // The dialog is laid out in the NIB exactly how we want it assuming that
+  // each label fits on one line. However, for each label, we want to allow
+  // wrapping onto multiple lines. So we accumulate an offset by measuring how
+  // big each label wants to be, and comparing it to how big it actually is.
+  // Then we shift each label down and resize by the appropriate amount, then
+  // finally resize the window.
   CGFloat totalOffset = 0.0;
+
+  if ([self isBundleInstall]) {
+    [subtitleField_ setStringValue:base::SysUTF16ToNSString(
+        prompt_->GetPermissionsHeading())];
+
+    // We display the list of extension names as a simple text string, seperated
+    // by newlines.
+    BundleInstaller::ItemList items = prompt_->bundle()->GetItemsWithState(
+        BundleInstaller::Item::STATE_PENDING);
+
+    NSMutableString* joinedItems = [NSMutableString string];
+    for (size_t i = 0; i < items.size(); ++i) {
+      if (i > 0)
+        [joinedItems appendString:@"\n"];
+      [joinedItems appendString:base::SysUTF16ToNSString(
+          items[i].GetNameForDisplay())];
+    }
+    [itemsField_ setStringValue:joinedItems];
+
+    // Adjust the controls to fit the list of extensions.
+    OffsetControlVerticallyToFitContent(titleField_, &totalOffset);
+    OffsetControlVerticallyToFitContent(itemsField_, &totalOffset);
+  }
+
   // If there are any warnings, then we have to do some special layout.
   if (prompt_->GetPermissionCount() > 0) {
     [subtitleField_ setStringValue:base::SysUTF16ToNSString(
         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))];
     }
     [warningsField_ setStringValue:joinedWarnings];
 
-    // The dialog is laid out in the NIB exactly how we want it assuming that
-    // each label fits on one line. However, for each label, we want to allow
-    // wrapping onto multiple lines. So we accumulate an offset by measuring how
-    // big each label wants to be, and comparing it to how big it actually is.
-    // Then we shift each label down and resize by the appropriate amount, then
-    // finally resize the window.
-
-    // Additionally, in the store version of the dialog the icon extends past
-    // the one-line version of the permission field. Therefore when increasing
-    // the window size for multi-line permissions we don't have to add the full
-    // offset, only the part that extends past the icon.
+    // In the store version of the dialog the icon extends past the one-line
+    // version of the permission field. Therefore when increasing the window
+    // size for multi-line permissions we don't have to add the full offset,
+    // only the part that extends past the icon.
     CGFloat warningsGrowthSlack = 0;
-    if ([warningsField_ frame].origin.y > [iconView_ frame].origin.y) {
+    if (![self isBundleInstall] &&
+        [warningsField_ frame].origin.y > [iconView_ frame].origin.y) {
       warningsGrowthSlack =
           [warningsField_ frame].origin.y - [iconView_ frame].origin.y;
     }
 
-    totalOffset += AdjustControlHeightToFitContent(subtitleField_);
-    OffsetControlVertically(subtitleField_, -totalOffset);
+    // Adjust the controls to fit the permission warnings.
+    OffsetControlVerticallyToFitContent(subtitleField_, &totalOffset);
+    OffsetControlVerticallyToFitContent(warningsField_, &totalOffset);
 
-    totalOffset += AdjustControlHeightToFitContent(warningsField_);
-    OffsetControlVertically(warningsField_, -totalOffset);
     totalOffset = MAX(totalOffset - warningsGrowthSlack, 0);
+

[Robert Sesek, 2012/02/27 18:59:20]

nit: remove

[jstritar, 2012/03/05 18:05:08]

Done.

   } else if ([self isInlineInstall]) {
     // Inline installs that don't have a permissions section need to hide
     // controls related to that and shrink the window by the space they take
     // up.
     NSRect hiddenRect = NSUnionRect([warningsSeparator_ frame],
                                     [subtitleField_ frame]);
     hiddenRect = NSUnionRect(hiddenRect, [warningsField_ frame]);
     [warningsSeparator_ setHidden:YES];
     [subtitleField_ setHidden:YES];
     [warningsField_ setHidden:YES];
     totalOffset -= hiddenRect.size.height + kWarningsSeparatorPadding;
   }
 
   // If necessary, adjust the window size.
   if (totalOffset) {
     NSRect currentRect = [[self window] frame];
     [[self window] setFrame:NSMakeRect(currentRect.origin.x,
                                        currentRect.origin.y - totalOffset,
                                        currentRect.size.width,
                                        currentRect.size.height + totalOffset)
-                   display:NO];
+                    display:NO];
   }
 }
 
 - (void)didEndSheet:(NSWindow*)sheet
          returnCode:(int)returnCode
         contextInfo:(void*)contextInfo {
   [sheet close];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [self autorelease];
 }
 
-- (bool)isInlineInstall {
+- (BOOL)isBundleInstall {
+  return prompt_->type() == ExtensionInstallUI::BUNDLE_INSTALL_PROMPT;
+}
+
+- (BOOL)isInlineInstall {
   return prompt_->type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT;
 }
 
 - (void)appendRatingStar:(const SkBitmap*)skiaImage {
   NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(
       *skiaImage, base::mac::GetSystemColorSpace());
   NSRect frame = NSMakeRect(0, 0, skiaImage->width(), skiaImage->height());
   scoped_nsobject<NSImageView> view([[NSImageView alloc] initWithFrame:frame]);
   [view setImage:image];
 
@@ skipping 31 matching lines @@
   ExtensionInstallDialogController* controller =
       [[ExtensionInstallDialogController alloc]
         initWithParentWindow:native_window
                      profile:profile
                     delegate:delegate
                       prompt:prompt];
 
   // TODO(mihaip): Switch this to be tab-modal (http://crbug.com/95455)
   [controller runAsModalSheet];
 }