Download filename determination refactor (3/3)

content/browser/download/download_item_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_ITEM_IMPL_H_
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 44 matching lines @@
     // to OnDownloadedFileRemoved().
     virtual void CheckForFileRemoval(DownloadItem* download_item) = 0;
 
     // If all pre-requisites have been met, complete download processing.
     // TODO(rdsmith): Move into DownloadItem.
     virtual void MaybeCompleteDownload(DownloadItem* download) = 0;
 
     // For contextual issues like language and prefs.
     virtual content::BrowserContext* GetBrowserContext() const = 0;
 
+    // Get the DownloadFileManager to use for this download.
+    virtual DownloadFileManager* GetDownloadFileManager() = 0;
+
     // Handle any delegate portions of a state change operation on the
     // DownloadItem.
     virtual void DownloadStopped(DownloadItem* download) = 0;
     virtual void DownloadCompleted(DownloadItem* download) = 0;
     virtual void DownloadOpened(DownloadItem* download) = 0;
     virtual void DownloadRemoved(DownloadItem* download) = 0;
     virtual void DownloadRenamedToIntermediateName(DownloadItem* download) = 0;
     virtual void DownloadRenamedToFinalName(DownloadItem* download) = 0;
 
     // Assert consistent state for delgate object at various transitions.
@@ skipping 69 matching lines @@
   virtual bool MatchesQuery(const string16& query) const OVERRIDE;
   virtual bool IsPartialDownload() const OVERRIDE;
   virtual bool IsInProgress() const OVERRIDE;
   virtual bool IsCancelled() const OVERRIDE;
   virtual bool IsInterrupted() const OVERRIDE;
   virtual bool IsComplete() const OVERRIDE;
   virtual DownloadState GetState() const OVERRIDE;
   virtual const FilePath& GetFullPath() const OVERRIDE;
   virtual const FilePath& GetTargetFilePath() const OVERRIDE;
   virtual TargetDisposition GetTargetDisposition() const OVERRIDE;
-  virtual void OnTargetPathDetermined(
+  virtual void OnDownloadTargetDetermined(
       const FilePath& target_path,
       TargetDisposition disposition,
-      content::DownloadDangerType danger_type) OVERRIDE;
-  virtual void OnTargetPathSelected(const FilePath& target_path) OVERRIDE;
+      content::DownloadDangerType danger_type,
+      const FilePath& intermediate_path) OVERRIDE;
   virtual void OnContentCheckCompleted(
       content::DownloadDangerType danger_type) OVERRIDE;
-  virtual void OnIntermediatePathDetermined(DownloadFileManager* file_manager,
-                                            const FilePath& path) OVERRIDE;
   virtual const GURL& GetURL() const OVERRIDE;
   virtual const std::vector<GURL>& GetUrlChain() const OVERRIDE;
   virtual const GURL& GetOriginalUrl() const OVERRIDE;
   virtual const GURL& GetReferrerUrl() const OVERRIDE;
   virtual std::string GetSuggestedFilename() const OVERRIDE;
   virtual std::string GetContentDisposition() const OVERRIDE;
   virtual std::string GetMimeType() const OVERRIDE;
   virtual std::string GetOriginalMimeType() const OVERRIDE;
   virtual std::string GetReferrerCharset() const OVERRIDE;
   virtual std::string GetRemoteAddress() const OVERRIDE;
@@ skipping 254 matching lines @@
 
   // Net log to use for this download.
   const net::BoundNetLog bound_net_log_;
 
   base::WeakPtrFactory<DownloadItemImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemImpl);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_IMPL_H_