Merge 48149 - Relanding 48042....

chrome/browser/extensions/extension_install_ui.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 260 matching lines @@
     icon_ = *image;
   else
     icon_ = SkBitmap();
   if (icon_.empty()) {
     icon_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_EXTENSION_DEFAULT_ICON);
   }
 
   switch (prompt_type_) {
     case INSTALL_PROMPT: {
-      if (extension_->GetFullLaunchURL().is_valid()) {
-        // Special case extension apps to not show the install dialog.
-        // TODO(finnur): http://crbug.com/42443: Don't do this for all apps.
-        delegate_->InstallUIProceed(false);  // |create_app_shortcut|.
-        return;
-      }
-
+      // TODO(jcivelli): http://crbug.com/44771 We should not show an install
+      //                 dialog when installing an app from the gallery.
       NotificationService* service = NotificationService::current();
       service->Notify(NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           Source<ExtensionInstallUI>(this),
           NotificationService::NoDetails());
 
       std::vector<string16> warnings;
       GetV2Warnings(extension_, &warnings);
       ShowExtensionInstallUIPrompt2Impl(
           profile_, delegate_, extension_, &icon_, warnings);
       break;
@@ skipping 89 matching lines @@
     TabContents* tab_contents, Extension* new_theme,
     const std::string& previous_theme_id, bool previous_use_system_theme) {
 #if defined(TOOLKIT_GTK)
   return new GtkThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id, previous_use_system_theme);
 #else
   return new ThemeInstalledInfoBarDelegate(tab_contents, new_theme,
       previous_theme_id);
 #endif
 }