Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / download / download_history.h

diff --git a/src/chrome/browser/download/download_history.h b/src/chrome/browser/download/download_history.h
index e983c90..be037b1 100644 (file)
--- a/src/chrome/browser/download/download_history.h
+++ b/src/chrome/browser/download/download_history.h
@@ -67,8 +67,11 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
     virtual void OnDownloadHistoryDestroyed() {}
   };
 
-  // Returns true if the item is persisted.
-  static bool IsPersisted(content::DownloadItem* item);
+  // Returns true if the download is persisted. Not reliable when called from
+  // within a DownloadManager::Observer::OnDownloadCreated handler since the
+  // persisted state may not yet have been updated for a download that was
+  // restored from history.
+  static bool IsPersisted(const content::DownloadItem* item);
 
   // Neither |manager| nor |history| may be NULL.
   // DownloadService creates DownloadHistory some time after DownloadManager is
@@ -77,11 +80,19 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
       content::DownloadManager* manager,
       scoped_ptr<HistoryAdapter> history);
 
-  virtual ~DownloadHistory();
+  ~DownloadHistory() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
+  // Returns true if the download was restored from history. Safe to call from
+  // within a DownloadManager::Observer::OnDownloadCreated handler and can be
+  // used to distinguish between downloads that were created due to new requests
+  // vs. downloads that were created due to being restored from history. Note
+  // that the return value is only reliable for downloads that were restored by
+  // this specific DownloadHistory instance.
+  bool WasRestoredFromHistory(const content::DownloadItem* item) const;
+
  private:
   typedef std::set<content::DownloadItem*> ItemSet;
 
@@ -98,14 +109,14 @@ class DownloadHistory : public AllDownloadItemNotifier::Observer {
   void ItemAdded(uint32 id, bool success);
 
   // AllDownloadItemNotifier::Observer
-  virtual void OnDownloadCreated(
-      content::DownloadManager* manager, content::DownloadItem* item) OVERRIDE;
-  virtual void OnDownloadUpdated(
-      content::DownloadManager* manager, content::DownloadItem* item) OVERRIDE;
-  virtual void OnDownloadOpened(
-      content::DownloadManager* manager, content::DownloadItem* item) OVERRIDE;
-  virtual void OnDownloadRemoved(
-      content::DownloadManager* manager, content::DownloadItem* item) OVERRIDE;
+  void OnDownloadCreated(content::DownloadManager* manager,
+                         content::DownloadItem* item) override;
+  void OnDownloadUpdated(content::DownloadManager* manager,
+                         content::DownloadItem* item) override;
+  void OnDownloadOpened(content::DownloadManager* manager,
+                        content::DownloadItem* item) override;
+  void OnDownloadRemoved(content::DownloadManager* manager,
+                         content::DownloadItem* item) override;
 
   // Schedule a record to be removed from |history_| the next time
   // RemoveDownloadsBatch() runs. Schedule RemoveDownloadsBatch() to be run soon