Add GTK interface for installing bundles of extensions.

chrome/browser/extensions/extension_install_ui.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_install_ui.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/simple_message_box.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #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
 };
 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,
 };
 
 namespace {
 
 // Size of extension icon in top left of dialog.
 const int kIconSize = 69;
 
 }  // namespace
@@ skipping 15 matching lines @@
 void ExtensionInstallUI::Prompt::SetInlineInstallWebstoreData(
     const std::string& localized_user_count,
     double average_rating,
     int rating_count) {
   CHECK_EQ(INLINE_INSTALL_PROMPT, type_);
   localized_user_count_ = localized_user_count;
   average_rating_ = average_rating;
   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 {
     return l10n_util::GetStringUTF16(kTitleIds[type_]);
   }
 }
 
-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()));
   }
 }
 
 string16 ExtensionInstallUI::Prompt::GetAcceptButtonLabel() const {
   return l10n_util::GetStringUTF16(kAcceptButtonIds[type_]);
 }
 
 bool ExtensionInstallUI::Prompt::HasAbortButtonLabel() const {
   return kAbortButtonIds[type_] > 0;
 }
 
 string16 ExtensionInstallUI::Prompt::GetAbortButtonLabel() const {
   CHECK(HasAbortButtonLabel());
   return l10n_util::GetStringUTF16(kAbortButtonIds[type_]);
 }
 
-string16 ExtensionInstallUI::Prompt::GetPermissionsHeader() const {
+string16 ExtensionInstallUI::Prompt::GetPermissionsHeading() const {
   return l10n_util::GetStringUTF16(kPermissionsHeaderIds[type_]);
 }
 
 void ExtensionInstallUI::Prompt::AppendRatingStars(
     StarAppender appender, void* data) const {
   CHECK(appender);
   CHECK_EQ(INLINE_INSTALL_PROMPT, type_);
   int rating_integer = floor(average_rating_);
   double rating_fractional = average_rating_ - rating_integer;
 
@@ skipping 30 matching lines @@
   CHECK_EQ(INLINE_INSTALL_PROMPT, type_);
   return l10n_util::GetStringFUTF16(
       IDS_EXTENSION_USER_COUNT,
       UTF8ToUTF16(localized_user_count_));
 }
 
 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]);
 }
 
 ExtensionInstallUI::ExtensionInstallUI(Profile* profile)
     : profile_(profile),
       ui_loop_(MessageLoop::current()),
       previous_using_native_theme_(false),
       extension_(NULL),
       delegate_(NULL),
@@ skipping 94 matching lines @@
 }
 
 namespace {
 
 bool disable_failure_ui_for_tests = false;
 
 }  // namespace
 
 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),
       error);
 }
 
 void ExtensionInstallUI::SetIcon(SkBitmap* image) {
   if (image)
     icon_ = *image;
   else
@@ skipping 11 matching lines @@
     case RE_ENABLE_PROMPT:
     case INSTALL_PROMPT: {
       content::NotificationService* service =
           content::NotificationService::current();
       service->Notify(chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           content::Source<ExtensionInstallUI>(this),
           content::NotificationService::NoDetails());
 
       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:
       NOTREACHED() << "Unknown message";
       break;
   }
 }
 
 // static
 void ExtensionInstallUI::OpenAppInstalledNTP(Browser* browser,
@@ skipping 75 matching lines @@
     bool previous_using_native_theme) {
   Profile* profile = tab_contents->profile();
   return new ThemeInstalledInfoBarDelegate(
       tab_contents->infobar_tab_helper(),
       profile->GetExtensionService(),
       ThemeServiceFactory::GetForProfile(profile),
       new_theme,
       previous_theme_id,
       previous_using_native_theme);
 }