Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/download_target_determiner.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 37 matching lines @@
 // The only public entrypoint is the static Start() method which creates an
 // instance of DownloadTargetDeterminer.
 class DownloadTargetDeterminer
     : public content::DownloadItem::Observer {
  public:
   // Start the process of determing the target of |download|.
   //
   // |download_prefs| is required and must outlive |download|. It is used for
   //   determining the user's preferences regarding the default downloads
   //   directory, prompting and auto-open behavior.
-  // |last_selected_directory| is the most recent directory that was chosen by
-  //   the user. If the user needs to be prompted, then this directory will be
-  //   used as the directory for the download instead of the user's default
-  //   downloads directory.
   // |delegate| is required and must live until |callback| is invoked.
   // |callback| will be scheduled asynchronously on the UI thread after download
   //   determination is complete or after |download| is destroyed.
   //
   // Start() should be called on the UI thread.
   static void Start(content::DownloadItem* download,
                     DownloadPrefs* download_prefs,
-                    const base::FilePath& last_selected_directory,
                     DownloadTargetDeterminerDelegate* delegate,
                     const content::DownloadTargetCallback& callback);
 
   // Returns a .crdownload intermediate path for the |suggested_path|.
   static base::FilePath GetCrDownloadPath(const base::FilePath& suggested_path);
 
  private:
   // The main workflow is controlled via a set of state transitions. Each state
   // has an associated handler. The handler for STATE_FOO is DoFoo. Each handler
   // performs work, determines the next state to transition to and returns a
@@ skipping 33 matching lines @@
   enum PriorVisitsToReferrer {
     NO_VISITS_TO_REFERRER,
     VISITED_REFERRER,
   };
 
   // Construct a DownloadTargetDeterminer object. Constraints on the arguments
   // are as per Start() above.
   DownloadTargetDeterminer(
       content::DownloadItem* download,
       DownloadPrefs* download_prefs,
-      const base::FilePath& last_selected_directory,
       DownloadTargetDeterminerDelegate* delegate,
       const content::DownloadTargetCallback& callback);
 
   virtual ~DownloadTargetDeterminer();
 
   // Invoke each successive handler until a handler returns QUIT_DOLOOP or
   // COMPLETE. Note that as a result, this object might be deleted. So |this|
   // should not be accessed after calling DoLoop().
   void DoLoop();
 
@@ skipping 103 matching lines @@
   bool create_directory_;
   DownloadPathReservationTracker::FilenameConflictAction conflict_action_;
   content::DownloadDangerType danger_type_;
   base::FilePath virtual_path_;
   base::FilePath local_path_;
   base::FilePath intermediate_path_;
 
   content::DownloadItem* download_;
   DownloadPrefs* download_prefs_;
   DownloadTargetDeterminerDelegate* delegate_;
-  base::FilePath last_selected_directory_;
   content::DownloadTargetCallback completion_callback_;
   CancelableRequestConsumer history_consumer_;
 
   base::WeakPtrFactory<DownloadTargetDeterminer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTargetDeterminer);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TARGET_DETERMINER_H_