Do not show the install prompt for themes.

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"
@@ skipping 15 matching lines @@
 #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/browser/ui/webui/ntp/new_tab_ui.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_manifest_constants.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"
 #include "ui/gfx/image/image.h"
@@ skipping 158 matching lines @@
 size_t ExtensionInstallUI::Prompt::GetPermissionCount() const {
   return permissions_.size();
 }
 
 string16 ExtensionInstallUI::Prompt::GetPermission(size_t index) const {
   CHECK_LT(index, permissions_.size());
   return l10n_util::GetStringFUTF16(
       IDS_EXTENSION_PERMISSION_LINE, permissions_[index]);
 }
 
+// static
+scoped_refptr<Extension> ExtensionInstallUI::GetLocalizedExtensionForDisplay(
+    const DictionaryValue* manifest,
+    const std::string& id,
+    const std::string& localized_name,
+    const std::string& localized_description,
+    std::string* error) {
+  scoped_ptr<DictionaryValue> localized_manifest;
+  if (!localized_name.empty() || !localized_description.empty()) {
+    localized_manifest.reset(manifest->DeepCopy());
+    if (!localized_name.empty()) {
+      localized_manifest->SetString(extension_manifest_keys::kName,
+                                    localized_name);
+    }
+    if (!localized_description.empty()) {
+      localized_manifest->SetString(extension_manifest_keys::kDescription,
+                                    localized_description);
+    }
+  }
+
+  return Extension::Create(
+      FilePath(),
+      Extension::INTERNAL,
+      localized_manifest.get() ? *localized_manifest.get() : *manifest,
+      Extension::NO_FLAGS,
+      id,
+      error);
+}
+
 ExtensionInstallUI::ExtensionInstallUI(Profile* profile)
     : profile_(profile),
       ui_loop_(MessageLoop::current()),
       previous_using_native_theme_(false),
       extension_(NULL),
       delegate_(NULL),
+      prompt_(UNSET_PROMPT_TYPE),
       prompt_type_(NUM_PROMPT_TYPES),

[Yoyo Zhou, 2012/04/20 17:19:12]

nit: Presumably this could be UNSET_PROMPT_TYPE too?

[jstritar, 2012/04/20 18:03:29]

Done.

       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
       use_app_installed_bubble_(false),
       skip_post_install_ui_(false) {
   // Remember the current theme in case the user presses undo.
   if (profile_) {
     const Extension* previous_theme =
         ThemeServiceFactory::GetThemeForProfile(profile_);
     if (previous_theme)
       previous_theme_id_ = previous_theme->id();
     previous_using_native_theme_ =
         ThemeServiceFactory::GetForProfile(profile_)->UsingNativeTheme();
   }
 }
 
 ExtensionInstallUI::~ExtensionInstallUI() {
 }
 
+void ExtensionInstallUI::ConfirmBundleInstall(
+    extensions::BundleInstaller* bundle,
+    const ExtensionPermissionSet* permissions) {
+  DCHECK(ui_loop_ == MessageLoop::current());
+  bundle_ = bundle;
+  permissions_ = permissions;
+  delegate_ = bundle;
+
+  ShowConfirmation(BUNDLE_INSTALL_PROMPT);
+}
+
+void ExtensionInstallUI::ConfirmInlineInstall(
+    Delegate* delegate,
+    const Extension* extension,
+    SkBitmap* icon,
+    ExtensionInstallUI::Prompt prompt) {
+  DCHECK(ui_loop_ == MessageLoop::current());
+  extension_ = extension;
+  permissions_ = extension->GetActivePermissions();
+  delegate_ = delegate;
+  prompt_ = prompt;
+
+  SetIcon(icon);
+  ShowConfirmation(INLINE_INSTALL_PROMPT);
+}
+
+void ExtensionInstallUI::ConfirmWebstoreInstall(Delegate* delegate,
+                                                const Extension* extension,
+                                                const SkBitmap* icon) {
+  // SetIcon requires |extension_| to be set. ConfirmInstall will setup the
+  // remaining fields.
+  extension_ = extension;
+  SetIcon(icon);
+  ConfirmInstall(delegate, extension);
+}
+
 void ExtensionInstallUI::ConfirmInstall(Delegate* delegate,
                                         const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
 
   // We special-case themes to not show any confirm UI. Instead they are
   // immediately installed, and then we show an infobar (see OnInstallSuccess)
   // to allow the user to revert if they don't like it.
@@ skipping 89 matching lines @@
   else
     icon_ = SkBitmap();
   if (icon_.empty())
     icon_ = Extension::GetDefaultIcon(extension_->is_app());
 }
 
 void ExtensionInstallUI::OnImageLoaded(const gfx::Image& image,
                                        const std::string& extension_id,
                                        int index) {
   SetIcon(image.IsEmpty() ? NULL : image.ToSkBitmap());
-
-  switch (prompt_type_) {
-    case PERMISSIONS_PROMPT:
-    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());
-      prompt.set_extension(extension_);
-      prompt.set_icon(gfx::Image(new SkBitmap(icon_)));
-      ShowExtensionInstallDialog(profile_, delegate_, prompt);
-      break;
-    }
-    default:
-      NOTREACHED() << "Unknown message";
-      break;
-  }
+  ShowDialog();
 }
 
 // static
 void ExtensionInstallUI::OpenAppInstalledUI(Browser* browser,
                                             const std::string& app_id) {
 
   if (NewTabUI::ShouldShowApps()) {
     browser::NavigateParams params = browser->GetSingletonTabNavigateParams(
         GURL(chrome::kChromeUINewTabURL));
     browser::Navigate(&params);
@@ skipping 58 matching lines @@
   // Then either replace that old one or add a new one.
   InfoBarDelegate* new_delegate = GetNewThemeInstalledInfoBarDelegate(
       tab_contents, new_theme, previous_theme_id, previous_using_native_theme);
 
   if (old_delegate)
     infobar_helper->ReplaceInfoBar(old_delegate, new_delegate);
   else
     infobar_helper->AddInfoBar(new_delegate);
 }
 
 void ExtensionInstallUI::ShowConfirmation(PromptType prompt_type) {

[Yoyo Zhou, 2012/04/20 17:19:12]

prompt_type doesn't need to be passed in here -- you could set prompt_type_
before calling this, as the other members are set. Then you could skip calling
this function (which would become LoadImageIfNeeded or some such) for bundle and
inline installs and go directly to ShowDialog (which could also be called
ShowConfirmation, same as before, but it doesn't really matter).

[jstritar, 2012/04/20 18:03:29]

Done.

+  prompt_type_ = prompt_type;
+
+  // Bundle install prompts do not have an icon.
+  if (!icon_.empty() || prompt_type == BUNDLE_INSTALL_PROMPT) {
+    ShowDialog();
+    return;
+  }
+
   // Load the image asynchronously. For the response, check OnImageLoaded.
-  prompt_type_ = prompt_type;
   ExtensionResource image =
       extension_->GetIconResource(ExtensionIconSet::EXTENSION_ICON_LARGE,
                                   ExtensionIconSet::MATCH_BIGGER);
   tracker_.LoadImage(extension_, image,
                      gfx::Size(kIconSize, kIconSize),
                      ImageLoadingTracker::DONT_CACHE);
 }
 
+void ExtensionInstallUI::ShowDialog() {
+  prompt_.set_type(prompt_type_);
+  prompt_.SetPermissions(permissions_->GetWarningMessages());
+
+  switch (prompt_type_) {
+    case PERMISSIONS_PROMPT:
+    case RE_ENABLE_PROMPT:
+    case INLINE_INSTALL_PROMPT:
+    case INSTALL_PROMPT: {
+      prompt_.set_extension(extension_);
+      prompt_.set_icon(gfx::Image(new SkBitmap(icon_)));
+      ShowExtensionInstallDialog(profile_, delegate_, prompt_);
+      break;
+    }
+    case BUNDLE_INSTALL_PROMPT: {
+      prompt_.set_bundle(bundle_);
+      ShowExtensionInstallDialog(profile_, delegate_, prompt_);
+      break;
+    }
+    default:
+      NOTREACHED() << "Unknown message";
+      break;
+  }
+}
+
 InfoBarDelegate* ExtensionInstallUI::GetNewThemeInstalledInfoBarDelegate(
     TabContentsWrapper* tab_contents,
     const Extension* new_theme,
     const std::string& previous_theme_id,
     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);
 }