Add GTK interface for installing bundles of extensions.

chrome/browser/extensions/extension_install_ui.cc

Index: chrome/browser/extensions/extension_install_ui.cc
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index 1ae8529fa7785fa74a4dec07d6f44e115fefe717..92b864a0b9e8ce0d3d740907ccb1603fa449d72b 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -13,6 +13,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.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/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ -42,22 +43,26 @@
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
+using extensions::BundleInstaller;
 
 static const int kTitleIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   0,
   IDS_EXTENSION_INLINE_INSTALL_PROMPT_TITLE,
+  IDS_EXTENSION_INSTALL_PROMPT_TITLE,
   IDS_EXTENSION_RE_ENABLE_PROMPT_TITLE,
   IDS_EXTENSION_PERMISSIONS_PROMPT_TITLE
 };
 static const int kHeadingIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_INSTALL_PROMPT_HEADING,
-  IDS_EXTENSION_INSTALL_PROMPT_HEADING,
+  0,

[Mihai Parparita -not on Chrome, 2012/02/24 01:42:03]

Since there's enough of these 0 "gaps" in these tables, can you add comments
saying what each one corresponds to and/or why a value is not needed?

[jstritar, 2012/02/24 18:21:46]

Done.

+  0,
   IDS_EXTENSION_RE_ENABLE_PROMPT_HEADING,
   IDS_EXTENSION_PERMISSIONS_PROMPT_HEADING
 };
 static const int kAcceptButtonIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
   IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
+  IDS_EXTENSION_PROMPT_INSTALL_BUTTON,
   IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON,
   IDS_EXTENSION_PROMPT_PERMISSIONS_BUTTON
 };
@@ -65,11 +70,13 @@ static const int kAbortButtonIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   0,
   0,
   0,
+  0,
   IDS_EXTENSION_PROMPT_PERMISSIONS_ABORT_BUTTON
 };
 static const int kPermissionsHeaderIds[ExtensionInstallUI::NUM_PROMPT_TYPES] = {
   IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO,
+  IDS_EXTENSION_PROMPT_THESE_WILL_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO,
   IDS_EXTENSION_PROMPT_WANTS_ACCESS_TO,
 };
@@ -105,10 +112,9 @@ void ExtensionInstallUI::Prompt::SetInlineInstallWebstoreData(
   rating_count_ = rating_count;
 }
 
-string16 ExtensionInstallUI::Prompt::GetDialogTitle(
-    const Extension* extension) const {
+string16 ExtensionInstallUI::Prompt::GetDialogTitle() const {
   if (type_ == INSTALL_PROMPT) {
-    return l10n_util::GetStringUTF16(extension->is_app() ?
+    return l10n_util::GetStringUTF16(extension_->is_app() ?
         IDS_EXTENSION_INSTALL_APP_PROMPT_TITLE :
         IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE);
   } else {
@@ -116,13 +122,14 @@ string16 ExtensionInstallUI::Prompt::GetDialogTitle(
   }
 }
 
-string16 ExtensionInstallUI::Prompt::GetHeading(
-    const std::string& extension_name) const {
+string16 ExtensionInstallUI::Prompt::GetHeading() const {
   if (type_ == INLINE_INSTALL_PROMPT) {
-    return UTF8ToUTF16(extension_name);
+    return UTF8ToUTF16(extension_->name());
+  } else if (type_ == BUNDLE_INSTALL_PROMPT) {
+    return bundle_->GetHeadingTextFor(BundleInstaller::Item::STATE_PENDING);
   } else {
     return l10n_util::GetStringFUTF16(
-        kHeadingIds[type_], UTF8ToUTF16(extension_name));
+        kHeadingIds[type_], UTF8ToUTF16(extension_->name()));
   }
 }
 
@@ -139,7 +146,7 @@ string16 ExtensionInstallUI::Prompt::GetAbortButtonLabel() const {
   return l10n_util::GetStringUTF16(kAbortButtonIds[type_]);
 }
 
-string16 ExtensionInstallUI::Prompt::GetPermissionsHeader() const {
+string16 ExtensionInstallUI::Prompt::GetPermissionsHeading() const {
   return l10n_util::GetStringUTF16(kPermissionsHeaderIds[type_]);
 }
 
@@ -190,7 +197,8 @@ size_t ExtensionInstallUI::Prompt::GetPermissionCount() const {
   return permissions_.size();
 }
 
-string16 ExtensionInstallUI::Prompt::GetPermission(int index) const {
+string16 ExtensionInstallUI::Prompt::GetPermission(size_t index) const {
+  CHECK_LT(index, permissions_.size());
   return l10n_util::GetStringFUTF16(
       IDS_EXTENSION_PERMISSION_LINE, permissions_[index]);
 }
@@ -305,10 +313,10 @@ bool disable_failure_ui_for_tests = false;
 
 void ExtensionInstallUI::OnInstallFailure(const string16& error) {
   DCHECK(ui_loop_ == MessageLoop::current());
+  if (disable_failure_ui_for_tests || skip_post_install_ui_)
+    return;
 
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
-  if (disable_failure_ui_for_tests)
-    return;
   browser::ShowErrorBox(
       browser ? browser->window()->GetNativeHandle() : NULL,
       l10n_util::GetStringUTF16(IDS_EXTENSION_INSTALL_FAILURE_TITLE),
@@ -340,8 +348,9 @@ void ExtensionInstallUI::OnImageLoaded(
 
       Prompt prompt(prompt_type_);
       prompt.SetPermissions(permissions_->GetWarningMessages());
-      ShowExtensionInstallDialog(
-          profile_, delegate_, extension_, &icon_, prompt);
+      prompt.set_extension(extension_);
+      prompt.set_icon(icon_);
+      ShowExtensionInstallDialog(profile_, delegate_, prompt);
       break;
     }
     default: