Download filename determination refactor (3/3)

content/public/browser/download_item.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.
 //
 // Each download is represented by a DownloadItem, and all DownloadItems
 // are owned by the DownloadManager which maintains a global list of all
 // downloads. DownloadItems are created when a user initiates a download,
 // and exist for the duration of the browser life time.
 //
 // Download observers:
 //   DownloadItem::Observer:
 //     - allows observers to receive notifications about one download from start
 //       to completion
 // Use AddObserver() / RemoveObserver() on the appropriate download object to
 // receive state updates.
 
 #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_ITEM_H_
 #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_ITEM_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/common/page_transition_types.h"
 
-class DownloadFileManager;
 class FilePath;
 class GURL;
 struct DownloadCreateInfo;
 
 namespace base {
 class Time;
 class TimeDelta;
 }
 
 namespace content {
@@ skipping 173 matching lines @@
   virtual const FilePath& GetFullPath() const = 0;
 
   // Target path of an in-progress download. We may be downloading to a
   // temporary or intermediate file (specified by |current_path_|.  Once the
   // download completes, we will rename the file to |target_path_|.
   virtual const FilePath& GetTargetFilePath() const = 0;
 
   // Get the target disposition.
   virtual TargetDisposition GetTargetDisposition() const = 0;
 
-  // Called when the target path has been determined. |target_path| is the
-  // suggested target path. |disposition| indicates how the target path should
-  // be used (see TargetDisposition). |danger_type| is the danger level of
-  // |target_path| as determined by the caller. If |disposition| is
-  // TARGET_DISPOSITION_PROMPT, then OnTargetPathSelected() should be called
-  // subsequently with the user's selected target path.
-  virtual void OnTargetPathDetermined(
-      const FilePath& target_path,
-      TargetDisposition disposition,
-      content::DownloadDangerType danger_type) = 0;
-
-  // This method should be called if and only if OnTargetPathDetermined() was
-  // called previously with disposition set to TARGET_DISPOSITION_PROMPT.
-  // |target_path| is the path that the user selected after being prompted for a
-  // target path.
-  virtual void OnTargetPathSelected(const FilePath& target_path) = 0;
-
   // Called if a check of the download contents was performed and the results of
   // the test are available. This should only be called after AllDataSaved() is
   // true.
   virtual void OnContentCheckCompleted(DownloadDangerType danger_type) = 0;
 
-  virtual void OnIntermediatePathDetermined(DownloadFileManager* file_manager,
-                                            const FilePath& path) = 0;
-
   virtual bool IsPersisted() const = 0;
 
   // Accessors
   virtual const std::string& GetHash() const = 0;
   virtual DownloadState GetState() const = 0;
   virtual const GURL& GetURL() const = 0;
   virtual const std::vector<GURL>& GetUrlChain() const = 0;
   virtual const GURL& GetOriginalUrl() const = 0;
   virtual const GURL& GetReferrerUrl() const = 0;
   virtual std::string GetSuggestedFilename() const = 0;
@@ skipping 16 matching lines @@
   virtual bool GetFileExternallyRemoved() const = 0;
   virtual SafetyState GetSafetyState() const = 0;
   // Why |safety_state_| is not SAFE.
   virtual DownloadDangerType GetDangerType() const = 0;
   virtual bool IsDangerous() const = 0;
 
   virtual bool GetAutoOpened() = 0;
   virtual FilePath GetTargetName() const = 0;
   virtual const FilePath& GetForcedFilePath() const = 0;
   virtual bool HasUserGesture() const = 0;
-  virtual content::PageTransition GetTransitionType() const = 0;
+  virtual PageTransition GetTransitionType() const = 0;
   virtual bool IsOtr() const = 0;
   virtual bool IsTemporary() const = 0;
   virtual void SetIsTemporary(bool temporary) = 0;
   virtual void SetOpened(bool opened) = 0;
   virtual bool GetOpened() const = 0;
 
   virtual const std::string& GetLastModifiedTime() const = 0;
   virtual const std::string& GetETag() const = 0;
 
   virtual DownloadInterruptReason GetLastReason() const = 0;
@@ skipping 33 matching lines @@
   virtual void SetExternalData(const void* key, ExternalData* data) = 0;
 
   virtual std::string DebugString(bool verbose) const = 0;
 
   virtual void MockDownloadOpenForTesting() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DOWNLOAD_ITEM_H_