Rearrange Should*Download delegate calls to be more useful and intuitive.

chrome/browser/download/chrome_download_manager_delegate.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 126 matching lines @@
   FilePath::StringType extension = path.Extension();
   if (extension.empty())
     return false;
   if (Extension::IsExtension(path))
     return false;
   DCHECK(extension[0] == FilePath::kExtensionSeparator);
   extension.erase(0, 1);
   return download_prefs_->IsAutoOpenEnabledForExtension(extension);
 }
 
-bool ChromeDownloadManagerDelegate::ShouldOpenDownload(DownloadItem* item) {
-  if (!IsExtensionDownload(item))
-    return true;
-
-  download_crx_util::OpenChromeExtension(profile_, *item);
-  return false;
+bool ChromeDownloadManagerDelegate::ShouldCompleteDownload(DownloadItem* item) {
+  return true;
 }
 
-bool ChromeDownloadManagerDelegate::ShouldCompleteDownload(DownloadItem* item) {
+bool ChromeDownloadManagerDelegate::ShouldOpenDownload(DownloadItem* item) {
   if (!IsExtensionDownload(item)) {
 #if defined(ENABLE_SAFE_BROWSING)
     // Begin the safe browsing download protection check.
     SafeBrowsingService* sb_service =
         g_browser_process->safe_browsing_service();
     if (sb_service && sb_service->download_protection_service() &&
         profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
       using safe_browsing::DownloadProtectionService;
       sb_service->download_protection_service()->CheckClientDownload(
           DownloadProtectionService::DownloadInfo::FromDownloadItem(*item),
           base::Bind(
               &ChromeDownloadManagerDelegate::CheckClientDownloadDone,
               this, item->id()));
       // For now, we won't delay the download for this.
     }
 #else
     // Assume safe.
 #endif
 
     return true;
   }
 
   scoped_refptr<CrxInstaller> crx_installer =
       download_crx_util::OpenChromeExtension(profile_, *item);
 
   // CRX_INSTALLER_DONE will fire when the install completes.  Observe()
-  // will call CompleteDelayedDownload() on this item.  If this DownloadItem is
+  // 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->id();
   // 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();
@@ skipping 144 matching lines @@
   registrar_.Remove(this,
                     chrome::NOTIFICATION_CRX_INSTALLER_DONE,
                     source);
 
   CrxInstaller* installer = content::Source<CrxInstaller>(source).ptr();
   int download_id = crx_installers_[installer];
   crx_installers_.erase(installer);
 
   DownloadItem* item = download_manager_->GetActiveDownloadItem(download_id);
   if (item)
-    item->CompleteDelayedDownload();
+    item->DelayedDownloadOpened();
 }
 
 void ChromeDownloadManagerDelegate::CheckVisitedReferrerBeforeDone(
     int32 download_id,
     bool visited_referrer_before) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadItem* download =
       download_manager_->GetActiveDownloadItem(download_id);
   if (!download)
@@ skipping 204 matching lines @@
 // TODO(noelutz): This function currently works as a callback place holder.
 // Once we decide the hash check is reliable, we could move the
 // MaybeCompleteDownload in OnAllDataSaved to this function.
 void ChromeDownloadManagerDelegate::CheckDownloadHashDone(
     int32 download_id,
     bool is_dangerous_hash) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DVLOG(1) << "CheckDownloadHashDone, download_id: " << download_id
            << " is dangerous_hash: " << is_dangerous_hash;
 }