Improve the UI for disabling off-store extension install.

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 105 matching lines @@
     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 {
+  int resource_id = kTitleIds[type_];
+
   if (type_ == INSTALL_PROMPT) {
-    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_]);
+    if (extension_->is_app())
+      resource_id = IDS_EXTENSION_INSTALL_APP_PROMPT_TITLE;
+    else if (extension_->is_theme())
+      resource_id = IDS_EXTENSION_INSTALL_THEME_PROMPT_TITLE;
+    else
+      resource_id = IDS_EXTENSION_INSTALL_EXTENSION_PROMPT_TITLE;
   }
+
+  return l10n_util::GetStringUTF16(resource_id);
 }
 
 string16 ExtensionInstallUI::Prompt::GetHeading() const {
   if (type_ == INLINE_INSTALL_PROMPT) {
     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()));
@@ skipping 163 matching lines @@
 }
 
 void ExtensionInstallUI::ConfirmInstall(Delegate* delegate,
                                         const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
   extension_ = extension;
   permissions_ = extension->GetActivePermissions();
   delegate_ = delegate;
   prompt_type_ = INSTALL_PROMPT;
 
-  // 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.
-  if (extension->is_theme()) {
+  // In the Web Store, 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.
+  //
+  // We don't do this off-store because we don't want websites to be able to
+  // clickjack people into installing themes. Even though it's not dangerous, it
+  // would be annoying.
+  if (extension->from_webstore() && extension->is_theme()) {
     delegate->InstallUIProceed();
     return;
   }
 
   LoadImageIfNeeded();
 }
 
 void ExtensionInstallUI::ConfirmReEnable(Delegate* delegate,
                                          const Extension* extension) {
   DCHECK(ui_loop_ == MessageLoop::current());
@@ skipping 212 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);
 }