[Downloads] Ask DownloadHistory if a download was from history.

chrome/browser/download/download_ui_controller.cc

 // Copyright 2013 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/download_ui_controller.h"
 
+#include "base/callback.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/download_controller_android.h"
 #else
 #include "chrome/browser/profiles/profile.h"
 #endif
 
 namespace {
 
 // DefaultUIControllerDelegate{Android,} is used when a DownloadUIController is
 // constructed without specifying an explicit Delegate.
 #if defined(OS_ANDROID)
 
 class DefaultUIControllerDelegateAndroid
     : public DownloadUIController::Delegate {
  public:
   DefaultUIControllerDelegateAndroid() {}
   virtual ~DefaultUIControllerDelegateAndroid() {}
 
  private:
   // DownloadUIController::Delegate
-  virtual void NotifyDownloadStarting(content::DownloadItem* item) OVERRIDE;
+  virtual void OnNewDownloadReady(content::DownloadItem* item) OVERRIDE;
 };
 
-void DefaultUIControllerDelegateAndroid::NotifyDownloadStarting(
+void DefaultUIControllerDelegateAndroid::OnNewDownloadReady(
     content::DownloadItem* item) {
+  // The Android DownloadController is only interested in IN_PROGRESS downloads.
+  // Ones which are INTERRUPTED etc. can't be handed over to the Android
+  // DownloadManager.
+  if (item->GetState() != content::DownloadItem::IN_PROGRESS)
+    return;
+
   // GET downloads without authentication are delegated to the Android
   // DownloadManager. Chrome is responsible for the rest.  See
   // InterceptDownloadResourceThrottle::ProcessDownloadRequest().
   content::DownloadControllerAndroid::Get()->OnDownloadStarted(item);
 }
 
 #else  // OS_ANDROID
 
 class DefaultUIControllerDelegate : public DownloadUIController::Delegate {
  public:
   // |profile| is required to outlive DefaultUIControllerDelegate.
   explicit DefaultUIControllerDelegate(Profile* profile)
       : profile_(profile) {}
   virtual ~DefaultUIControllerDelegate() {}
 
  private:
   // DownloadUIController::Delegate
-  virtual void NotifyDownloadStarting(content::DownloadItem* item) OVERRIDE;
+  virtual void OnNewDownloadReady(content::DownloadItem* item) OVERRIDE;
 
   Profile* profile_;
 };
 
-void DefaultUIControllerDelegate::NotifyDownloadStarting(
+void DefaultUIControllerDelegate::OnNewDownloadReady(
     content::DownloadItem* item) {
   content::WebContents* web_contents = item->GetWebContents();
   Browser* browser =
       web_contents ? chrome::FindBrowserWithWebContents(web_contents) : NULL;
 
   // As a last resort, use the last active browser for this profile. Not ideal,
   // but better than not showing the download at all.
   if (browser == NULL) {
     browser = chrome::FindLastActiveWithProfile(profile_,
                                                 chrome::GetActiveDesktop());
@@ skipping 25 matching lines @@
         Profile::FromBrowserContext(manager->GetBrowserContext())));
 #endif
   }
 }
 
 DownloadUIController::~DownloadUIController() {
 }
 
 void DownloadUIController::OnDownloadCreated(content::DownloadManager* manager,
                                              content::DownloadItem* item) {
-  // If this isn't a new download, there's nothing to do.
-  if (item->GetState() != content::DownloadItem::IN_PROGRESS)
-    return;
-
-  DownloadItemModel(item).SetShouldNotifyUI(true);
   // SavePackage downloads are created in a state where they can be shown in the
   // browser. Call OnDownloadUpdated() once to notify the UI immediately.
   OnDownloadUpdated(manager, item);
 }
 
 void DownloadUIController::OnDownloadUpdated(content::DownloadManager* manager,
                                              content::DownloadItem* item) {
+  DownloadItemModel item_model(item);
+
   // Ignore if we've already notified the UI about |item| or if it isn't a new
   // download.
-  if (!DownloadItemModel(item).ShouldNotifyUI())
+  if (item_model.WasUINotified() || !item_model.ShouldNotifyUI())
     return;
 
   // Wait until the target path is determined.
   if (item->GetTargetFilePath().empty())
     return;
 
-  // Can't be complete. That would imply that we didn't receive an
-  // OnDownloadUpdated() after the target was determined.
-  DCHECK_NE(content::DownloadItem::COMPLETE, item->GetState());
-
-  DownloadItemModel(item).SetShouldNotifyUI(false);
-  delegate_->NotifyDownloadStarting(item);
+  DownloadItemModel(item).SetWasUINotified(true);
+  delegate_->OnNewDownloadReady(item);
 }