Download filename determination refactor (3/3)

content/browser/download/download_manager_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 58 matching lines @@
   virtual void DownloadUrl(
       scoped_ptr<content::DownloadUrlParameters> params) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual void OnPersistentStoreQueryComplete(
       std::vector<content::DownloadPersistentStoreInfo>* entries) OVERRIDE;
   virtual void OnItemAddedToPersistentStore(int32 download_id,
                                             int64 db_handle) OVERRIDE;
   virtual int InProgressCount() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
-  virtual FilePath LastDownloadPath() OVERRIDE;
   virtual net::BoundNetLog CreateDownloadItem(
       DownloadCreateInfo* info) OVERRIDE;
   virtual content::DownloadItem* CreateSavePackageDownloadItem(
       const FilePath& main_file_path,
       const GURL& page_url,
       bool is_otr,
       const std::string& mime_type,
       content::DownloadItem::Observer* observer) OVERRIDE;
-  virtual void ClearLastDownloadPath() OVERRIDE;
-  virtual void FileSelected(const FilePath& path, int32 download_id) OVERRIDE;
-  virtual void FileSelectionCanceled(int32 download_id) OVERRIDE;
-  virtual void RestartDownload(int32 download_id) OVERRIDE;
+  virtual void ClearTransientState() OVERRIDE;
   virtual void CheckForHistoryFilesRemoval() OVERRIDE;
   virtual content::DownloadItem* GetDownloadItem(int id) OVERRIDE;
   virtual content::DownloadItem* GetDownload(int id) OVERRIDE;
   virtual void SavePageDownloadFinished(
       content::DownloadItem* download) OVERRIDE;
   virtual content::DownloadItem* GetActiveDownloadItem(int id) OVERRIDE;
   virtual bool GenerateFileHash() OVERRIDE;
 
   // Overridden from DownloadItemImpl::Delegate
   // (Note that |GetBrowserContext| are present in both interfaces.)
+  virtual DownloadFileManager* GetDownloadFileManager() OVERRIDE;
   virtual bool ShouldOpenDownload(content::DownloadItem* item) OVERRIDE;
   virtual bool ShouldOpenFileBasedOnExtension(
       const FilePath& path) OVERRIDE;
   virtual void CheckForFileRemoval(
       content::DownloadItem* download_item) OVERRIDE;
   virtual void MaybeCompleteDownload(
       content::DownloadItem* download) OVERRIDE;
   virtual void DownloadStopped(
       content::DownloadItem* download) OVERRIDE;
   virtual void DownloadCompleted(
@@ skipping 35 matching lines @@
   content::DownloadId GetNextId();
 
   // Called on the FILE thread to check the existence of a downloaded file.
   void CheckForFileRemovalOnFileThread(int32 download_id, const FilePath& path);
 
   // Called on the UI thread if the FILE thread detects the removal of
   // the downloaded file. The UI thread updates the state of the file
   // and then notifies this update to the file's observer.
   void OnFileRemovalDetected(int32 download_id);
 
-  // Called back after a target path for the file to be downloaded to has been
-  // determined, either automatically based on the suggested file name, or by
-  // the user in a Save As dialog box.
-  void OnTargetPathAvailable(content::DownloadItem* download);
-
   // Retrieves the download from the |download_id|.
   // Returns NULL if the download is not active.
   content::DownloadItem* GetActiveDownload(int32 download_id);
 
   // Removes |download| from the active and in progress maps.
   // Called when the download is cancelled or has an error.
   // Does nothing if the download is not in the history DB.
   void RemoveFromActiveList(content::DownloadItem* download);
 
   // Inform observers that the model has changed.
   void NotifyModelChanged();
 
   // Debugging routine to confirm relationship between below
   // containers; no-op if NDEBUG.
   void AssertContainersConsistent() const;
 
   // Add a DownloadItem to history_downloads_.
   void AddDownloadItemToHistory(content::DownloadItem* item, int64 db_handle);
 
   // Remove from internal maps.
   int RemoveDownloadItems(const DownloadVector& pending_deletes);
 
   // Called in response to our request to the DownloadFileManager to
   // create a DownloadFile.  A |reason| of
   // content::DOWNLOAD_INTERRUPT_REASON_NONE indicates success.
   void OnDownloadFileCreated(
       int32 download_id, content::DownloadInterruptReason reason);
 
+  void OnDownloadTargetDetermined(
+      int32 download_id,
+      const FilePath& target_path,
+      content::DownloadItem::TargetDisposition disposition,
+      content::DownloadDangerType danger_type,
+      const FilePath& intermediate_path);
+
   // Called when a download entry is committed to the persistent store.
   void OnDownloadItemAddedToPersistentStore(int32 download_id, int64 db_handle);
 
   // Called when Save Page As entry is committed to the persistent store.
   void OnSavePageItemAddedToPersistentStore(int32 download_id, int64 db_handle);
 
   // Factory for creation of downloads items.
   scoped_ptr<content::DownloadItemFactory> factory_;
 
   // |downloads_| is the owning set for all downloads known to the
@@ skipping 34 matching lines @@
 
   // Observers that want to be notified of changes to the set of downloads.
   ObserverList<Observer> observers_;
 
   // The current active browser context.
   content::BrowserContext* browser_context_;
 
   // Non-owning pointer for handling file writing on the download_thread_.
   DownloadFileManager* file_manager_;
 
-  // The user's last choice for download directory. This is only used when the
-  // user wants us to prompt for a save location for each download.
-  FilePath last_download_path_;
-
   // Allows an embedder to control behavior. Guaranteed to outlive this object.
   content::DownloadManagerDelegate* delegate_;
 
   net::NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerImpl);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_MANAGER_IMPL_H_