Update UI for WebStore bundle installs.

chrome/browser/ui/cocoa/extensions/extension_installed_bubble_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_installed_bubble_controller.h"
 
 #include "base/i18n/rtl.h"
+#include "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/bundle_installer.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 18 matching lines @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "extensions/browser/install/extension_install_ui.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #import "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
 
 using content::BrowserThread;
 using extensions::BundleInstaller;
 using extensions::Extension;
 
+// Size of individual extension icons for bundle installs.
+const CGFloat kExtensionIconSize = 32;
+
 class ExtensionInstalledBubbleBridge
     : public ExtensionInstalledBubble::Delegate {
  public:
   explicit ExtensionInstalledBubbleBridge(
       ExtensionInstalledBubbleController* controller);
   ~ExtensionInstalledBubbleBridge() override;
 
  private:
   // ExtensionInstalledBubble::Delegate:
   bool MaybeShowNow() override;
@@ skipping 269 matching lines @@
 - (int)calculateWindowHeight {
   // Adjust the window height to reflect the sum height of all messages
   // and vertical padding.
   int newWindowHeight = 2 * extension_installed_bubble::kOuterVerticalMargin;
 
   // If type is bundle, list the extensions that were installed and those that
   // failed.
   if (type_ == extension_installed_bubble::kBundle) {
     NSInteger installedListHeight =
         [self addExtensionList:installedHeadingMsg_
-                      itemsMsg:installedItemsMsg_
+                     itemsView:installedItemsView_
                          state:BundleInstaller::Item::STATE_INSTALLED];
 
     NSInteger failedListHeight =
         [self addExtensionList:failedHeadingMsg_
-                      itemsMsg:failedItemsMsg_
+                     itemsView:failedItemsView_
                          state:BundleInstaller::Item::STATE_FAILED];
 
     newWindowHeight += installedListHeight + failedListHeight;
 
     // Put some space between the lists if both are present.
     if (installedListHeight > 0 && failedListHeight > 0)
       newWindowHeight += extension_installed_bubble::kInnerVerticalMargin;
 
     return newWindowHeight;
   }
@@ skipping 99 matching lines @@
             chrome_style::GetLinkColor())];
     [GTMUILocalizerAndLayoutTweaker sizeToFitView:manageShortcutLink_];
     newWindowHeight += extension_installed_bubble::kInnerVerticalMargin;
     newWindowHeight += NSHeight([manageShortcutLink_ frame]);
   }
 
   return newWindowHeight;
 }
 
 - (NSInteger)addExtensionList:(NSTextField*)headingMsg
-                     itemsMsg:(NSTextField*)itemsMsg
+                    itemsView:(NSView*)itemsView
                         state:(BundleInstaller::Item::State)state {
   base::string16 heading = bundle_->GetHeadingTextFor(state);
   bool hidden = heading.empty();
   [headingMsg setHidden:hidden];
-  [itemsMsg setHidden:hidden];
+  [itemsView setHidden:hidden];
   if (hidden)
     return 0;
 
   [headingMsg setStringValue:base::SysUTF16ToNSString(heading)];
   [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:headingMsg];
 
-  NSMutableString* joinedItems = [NSMutableString string];
+  const CGFloat titleWidth = [itemsView frame].size.width - kExtensionIconSize;
+  CGFloat offset = 0;
+  // Go over the items backwards, since Cocoa coords go from the bottom up.

[Alexei Svitkine (slow), 2015/04/21 16:40:52]

This code appears to be the same as in extension_install_view_controller.mm.

Please find a way to share the code, instead of repeating it.

[Marc Treib, 2015/04/22 08:09:16]

Done. (Added new bundle_util.h/mm since there didn't seem to be a place for it
otherwise.)

   BundleInstaller::ItemList items = bundle_->GetItemsWithState(state);
-  for (size_t i = 0; i < items.size(); ++i) {
-    if (i > 0)
-      [joinedItems appendString:@"\n"];
-    [joinedItems appendString:base::SysUTF16ToNSString(
-        items[i].GetNameForDisplay())];
+  for (size_t i = items.size(); i > 0; --i) {
+    const BundleInstaller::Item& item = items[i - 1];
+
+    NSString* title = base::SysUTF16ToNSString(item.GetNameForDisplay());
+    base::scoped_nsobject<NSTextField> titleView([[NSTextField alloc]
+        initWithFrame:NSMakeRect(kExtensionIconSize, offset, titleWidth, 0)]);
+    [titleView setBordered:NO];
+    [titleView setEditable:NO];
+    [titleView setStringValue:title];
+    [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:titleView];
+
+    NSRect titleFrame = [titleView frame];
+    NSRect iconFrame =
+        NSMakeRect(0, offset, kExtensionIconSize, kExtensionIconSize);
+
+    // Vertically center-align icon and title.
+    CGFloat align = (iconFrame.size.height - titleFrame.size.height) / 2;
+    if (align > 0) {
+      titleFrame.origin.y += align;
+      [titleView setFrame:titleFrame];
+    } else {
+      iconFrame.origin.y -= align;
+    }
+
+    gfx::ImageSkia skiaImage = gfx::ImageSkia::CreateFrom1xBitmap(item.icon);
+    NSImage* image = gfx::NSImageFromImageSkiaWithColorSpace(
+        skiaImage, base::mac::GetSystemColorSpace());
+    base::scoped_nsobject<NSImageView> iconView(
+        [[NSImageView alloc] initWithFrame:iconFrame]);
+    [iconView setImage:image];
+
+    [itemsView addSubview:iconView];
+    [itemsView addSubview:titleView];
+
+    offset = NSMaxY(NSUnionRect(titleFrame, iconFrame));
   }
 
-  [itemsMsg setStringValue:joinedItems];
-  [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:itemsMsg];
+  NSRect frame = [itemsView frame];
+  frame.size.height = offset;
+  [itemsView setFrame:frame];
 
   return NSHeight([headingMsg frame]) +
       extension_installed_bubble::kInnerVerticalMargin +
-      NSHeight([itemsMsg frame]);
+      NSHeight([itemsView frame]);
 }
 
 // Adjust y-position of messages to sit properly in new window height.
 - (void)setMessageFrames:(int)newWindowHeight {
   if (type_ == extension_installed_bubble::kBundle) {
     // Layout the messages from the bottom up.
-    NSTextField* msgs[] = { failedItemsMsg_, failedHeadingMsg_,
-                            installedItemsMsg_, installedHeadingMsg_ };
+    NSView* msgs[] = { failedItemsView_, failedHeadingMsg_,
+                       installedItemsView_, installedHeadingMsg_ };
     NSInteger offsetFromBottom = 0;
     BOOL isFirstVisible = YES;
     for (size_t i = 0; i < arraysize(msgs); ++i) {
       if ([msgs[i] isHidden])
         continue;
 
       NSRect frame = [msgs[i] frame];
       NSInteger margin = isFirstVisible ?
           extension_installed_bubble::kOuterVerticalMargin :
           extension_installed_bubble::kInnerVerticalMargin;
@@ skipping 99 matching lines @@
   install_ui->OpenAppInstalledUI([self extension]->id());
 }
 
 - (void)awakeFromNib {
   if (bundle_)
     return;
   [self initializeLabel];
 }
 
 @end