Update UI for WebStore bundle installs.

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

+// Copyright 2015 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.
+
+#include "chrome/browser/ui/cocoa/extensions/bundle_util.h"
+
+#include "base/mac/mac_util.h"
+#include "base/mac/scoped_nsobject.h"
+#include "base/strings/sys_string_conversions.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_util_mac.h"
+#import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
+
+const CGFloat kExtensionIconSize = 32;

[Alexei Svitkine (slow), 2015/04/22 16:52:27]

Put in an anon namespace.

[Marc Treib, 2015/04/23 09:47:07]

Done. FTR though, it's not necessary here, since file-scope constants have
internal linkage anyway.

+
+CGFloat PopulateBundleItemsList(
+    NSView* itemsField, const extensions::BundleInstaller::ItemList& items) {

[Alexei Svitkine (slow), 2015/04/22 16:52:27]

1 param per line.

[Marc Treib, 2015/04/23 09:47:07]

Done.

+  const CGFloat titleWidth = [itemsField frame].size.width - kExtensionIconSize;

[Alexei Svitkine (slow), 2015/04/22 16:52:27]

C++ naming convention in free standing functions (title_width) - fix throughout.

[Marc Treib, 2015/04/23 09:47:07]

Done.

+  CGFloat offset = 0;
+  // Go over the items backwards, since Cocoa coords go from the bottom up.
+  for (size_t i = items.size(); i > 0; --i) {
+    const extensions::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];
+
+    [itemsField addSubview:iconView];
+    [itemsField addSubview:titleView];
+
+    offset = NSMaxY(NSUnionRect(titleFrame, iconFrame));
+  }
+  return offset;
+}