Add GTK interface for installing bundles of extensions.

chrome/browser/ui/views/extensions/extension_install_dialog_view.cc

Index: chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
index de9ee65b683554027d9b118d43a6f0fe9351aa9b..b20b81224a4e89e301e0239deb4544cca6570a65 100644
--- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -68,8 +68,6 @@ class ExtensionInstallDialogView : public views::DialogDelegateView,
                                    public views::LinkListener {
  public:
   ExtensionInstallDialogView(ExtensionInstallUI::Delegate* delegate,
-                             const Extension* extension,
-                             SkBitmap* skia_icon,
                              const ExtensionInstallUI::Prompt& prompt);
   virtual ~ExtensionInstallDialogView();
 
@@ -93,7 +91,6 @@ class ExtensionInstallDialogView : public views::DialogDelegateView,
   }
 
   ExtensionInstallUI::Delegate* delegate_;
-  const Extension* extension_;
   ExtensionInstallUI::Prompt prompt_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstallDialogView);
@@ -101,11 +98,8 @@ class ExtensionInstallDialogView : public views::DialogDelegateView,
 
 ExtensionInstallDialogView::ExtensionInstallDialogView(
     ExtensionInstallUI::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* skia_icon,
     const ExtensionInstallUI::Prompt& prompt)
     : delegate_(delegate),
-      extension_(extension),
       prompt_(prompt) {
   // Possible grid layouts:
   // Inline install
@@ -164,8 +158,7 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
 
   layout->StartRow(0, column_set_id);
 
-  views::Label* heading = new views::Label(
-      prompt.GetHeading(extension->name()));
+  views::Label* heading = new views::Label(prompt.GetHeading());
   heading->SetFont(heading->font().DeriveFont(kHeadingFontSizeDelta,
                                               gfx::Font::BOLD));
   heading->SetMultiLine(true);
@@ -174,12 +167,13 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
   layout->AddView(heading);
 
   // Scale down to icon size, but allow smaller icons (don't scale up).
-  gfx::Size size(skia_icon->width(), skia_icon->height());
+  SkBitmap bitmap = prompt.icon();
+  gfx::Size size(bitmap.width(), bitmap.height());
   if (size.width() > kIconSize || size.height() > kIconSize)
     size = gfx::Size(kIconSize, kIconSize);
   views::ImageView* icon = new views::ImageView();
   icon->SetImageSize(size);
-  icon->SetImage(*skia_icon);
+  icon->SetImage(bitmap);
   icon->SetHorizontalAlignment(views::ImageView::CENTER);
   icon->SetVerticalAlignment(views::ImageView::CENTER);
   int icon_row_span = 1;
@@ -235,7 +229,7 @@ ExtensionInstallDialogView::ExtensionInstallDialogView(
 
     layout->StartRow(0, column_set_id);
     views::Label* permissions_header = new views::Label(
-        prompt.GetPermissionsHeader());
+        prompt.GetPermissionsHeading());
     permissions_header->SetMultiLine(true);
     permissions_header->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     permissions_header->SizeToFit(left_column_width);
@@ -291,7 +285,7 @@ ui::ModalType ExtensionInstallDialogView::GetModalType() const {
 }
 
 string16 ExtensionInstallDialogView::GetWindowTitle() const {
-  return prompt_.GetDialogTitle(extension_);
+  return prompt_.GetDialogTitle();
 }
 
 views::View* ExtensionInstallDialogView::GetContentsView() {
@@ -300,8 +294,8 @@ views::View* ExtensionInstallDialogView::GetContentsView() {
 
 void ExtensionInstallDialogView::LinkClicked(views::Link* source,
                                              int event_flags) {
-  GURL store_url(
-      extension_urls::GetWebstoreItemDetailURLPrefix() + extension_->id());
+  GURL store_url(extension_urls::GetWebstoreItemDetailURLPrefix() +
+                 prompt_.extension()->id());
   OpenURLParams params(
       store_url, Referrer(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK,
       false);
@@ -312,8 +306,6 @@ void ExtensionInstallDialogView::LinkClicked(views::Link* source,
 void ShowExtensionInstallDialogImpl(
     Profile* profile,
     ExtensionInstallUI::Delegate* delegate,
-    const Extension* extension,
-    SkBitmap* icon,
     const ExtensionInstallUI::Prompt& prompt) {
 #if defined(OS_CHROMEOS)
   // Use a tabbed browser window as parent on ChromeOS.
@@ -333,7 +325,7 @@ void ShowExtensionInstallDialogImpl(
   }
 
   ExtensionInstallDialogView* dialog = new ExtensionInstallDialogView(
-      delegate, extension, icon, prompt);
+      delegate, prompt);
 
   views::Widget* window =  browser::CreateViewsWindow(
       browser_window->GetNativeHandle(), dialog, STYLE_GENERIC);