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/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"
 #include "chrome/browser/ui/chrome_style.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
+#include "chrome/browser/ui/cocoa/extensions/bundle_util.h"
 #include "chrome/browser/ui/cocoa/hover_close_button.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/new_tab_button.h"
 #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
 #include "chrome/browser/ui/extensions/extension_installed_bubble.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
@@ skipping 298 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];
-  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())];
-  }
+  CGFloat height =
+      PopulateBundleItemsList(bundle_->GetItemsWithState(state), itemsView);
 
-  [itemsMsg setStringValue:joinedItems];
-  [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:itemsMsg];
+  NSRect frame = [itemsView frame];
+  frame.size.height = height;
+  [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