Improve the UI for disabling off-store extension install.

chrome/browser/download/chrome_download_manager_delegate.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/download/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 91 matching lines @@
 
 ChromeDownloadManagerDelegate::ChromeDownloadManagerDelegate(Profile* profile)
     : profile_(profile),
       next_download_id_(0),
       download_prefs_(new DownloadPrefs(profile->GetPrefs())) {
 }
 
 ChromeDownloadManagerDelegate::~ChromeDownloadManagerDelegate() {
 }
 
-bool ChromeDownloadManagerDelegate::IsExtensionDownload(
-    const DownloadItem* item) {
-  if (item->PromptUserForSaveLocation())
-    return false;
-
-  if (item->GetMimeType() == extensions::Extension::kMimeType ||
-      UserScript::IsURLUserScript(item->GetURL(), item->GetMimeType())) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
 void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
   download_manager_ = dm;
   download_history_.reset(new DownloadHistory(profile_));
   download_history_->Load(
       base::Bind(&DownloadManager::OnPersistentStoreQueryComplete,
                  base::Unretained(dm)));
 }
 
 void ChromeDownloadManagerDelegate::Shutdown() {
   download_history_.reset();
@@ skipping 158 matching lines @@
 
 bool ChromeDownloadManagerDelegate::ShouldCompleteDownload(
     DownloadItem* item,
     const base::Closure& user_complete_callback) {
   return IsDownloadReadyForCompletion(item, base::Bind(
       &ChromeDownloadManagerDelegate::ShouldCompleteDownloadInternal, this,
       item->GetId(), user_complete_callback));
 }
 
 bool ChromeDownloadManagerDelegate::ShouldOpenDownload(DownloadItem* item) {
-  if (IsExtensionDownload(item)) {
-    // We can open extensions if either they came from the store, or
-    // off-store-install is enabled.
-    if (extensions::switch_utils::IsOffStoreInstallEnabled() ||
-        WebstoreInstaller::GetAssociatedApproval(*item)) {
-      scoped_refptr<CrxInstaller> crx_installer =
-          download_crx_util::OpenChromeExtension(profile_, *item);
+  if (download_crx_util::IsExtensionDownload(*item)) {
+    scoped_refptr<CrxInstaller> crx_installer =
+        download_crx_util::OpenChromeExtension(profile_, *item);
 
-      // CRX_INSTALLER_DONE will fire when the install completes.  Observe()
-      // will call DelayedDownloadOpened() on this item.  If this DownloadItem
-      // is not around when CRX_INSTALLER_DONE fires, Complete() will not be
-      // called.
-      registrar_.Add(this,
-                     chrome::NOTIFICATION_CRX_INSTALLER_DONE,
-                     content::Source<CrxInstaller>(crx_installer.get()));
+    // CRX_INSTALLER_DONE will fire when the install completes.  Observe()
+    // will call DelayedDownloadOpened() on this item.  If this DownloadItem
+    // is not around when CRX_INSTALLER_DONE fires, Complete() will not be
+    // called.
+    registrar_.Add(this,
+                   chrome::NOTIFICATION_CRX_INSTALLER_DONE,
+                   content::Source<CrxInstaller>(crx_installer.get()));
 
-      crx_installers_[crx_installer.get()] = item->GetId();
-      // The status text and percent complete indicator will change now
-      // that we are installing a CRX.  Update observers so that they pick
-      // up the change.
-      item->UpdateObservers();
-      return false;
-    }
+    crx_installers_[crx_installer.get()] = item->GetId();
+    // The status text and percent complete indicator will change now
+    // that we are installing a CRX.  Update observers so that they pick
+    // up the change.
+    item->UpdateObservers();
+    return false;
   }
 
   if (ShouldOpenWithWebIntents(item)) {
     OpenWithWebIntent(item);
     item->DelayedDownloadOpened();
     return false;
   }
 
   return true;
 }
@@ skipping 229 matching lines @@
     // Freeze the user's preference for showing a Save As dialog.  We're going
     // to bounce around a bunch of threads and we don't want to worry about race
     // conditions where the user changes this pref out from under us.
     if (download_prefs_->PromptForDownload()) {
       // But ignore the user's preference for the following scenarios:
       // 1) Extension installation. Note that we only care here about the case
       //    where an extension is installed, not when one is downloaded with
       //    "save as...".
       // 2) Filetypes marked "always open." If the user just wants this file
       //    opened, don't bother asking where to keep it.
-      if (!IsExtensionDownload(download) &&
+      if (!download_crx_util::IsExtensionDownload(*download) &&
           !ShouldOpenFileBasedOnExtension(generated_name))
         state.prompt_user_for_save_location = true;
     }
     if (download_prefs_->IsDownloadPathManaged()) {
       state.prompt_user_for_save_location = false;
     }
 
     // Determine the proper path for a download, by either one of the following:
     // 1) using the default download directory.
     // 2) prompting the user.
@@ skipping 150 matching lines @@
     const DownloadStateInfo& state,
     bool visited_referrer_before) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Anything loaded directly from the address bar is OK.
   if (state.transition_type & content::PAGE_TRANSITION_FROM_ADDRESS_BAR)
     return false;
 
   // Extensions that are not from the gallery are considered dangerous.
   // When off-store install is disabled we skip this, since in this case, we
-  // will not offer to install the extension.
+  // will cancel the install later.
   if (extensions::switch_utils::IsOffStoreInstallEnabled() &&
-      IsExtensionDownload(&download) &&
+      download_crx_util::IsExtensionDownload(download) &&
       !WebstoreInstaller::GetAssociatedApproval(download)) {
     return true;
   }
 
   // Anything the user has marked auto-open is OK if it's user-initiated.
   if (ShouldOpenFileBasedOnExtension(state.suggested_path) &&
       state.has_user_gesture)
     return false;
 
   // "Allow on user gesture" is OK when we have a user gesture and the hosting
@@ skipping 10 matching lines @@
     int32 download_id, int64 db_handle) {
   // It's not immediately obvious, but HistoryBackend::CreateDownload() can
   // call this function with an invalid |db_handle|. For instance, this can
   // happen when the history database is offline. We cannot have multiple
   // DownloadItems with the same invalid db_handle, so we need to assign a
   // unique |db_handle| here.
   if (db_handle == DownloadItem::kUninitializedHandle)
     db_handle = download_history_->GetNextFakeDbHandle();
   download_manager_->OnItemAddedToPersistentStore(download_id, db_handle);
 }