Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/chrome_download_manager_delegate.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 CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 #define CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
@@ skipping 36 matching lines @@
       public content::DownloadManagerDelegate,
       public content::NotificationObserver {
  public:
   // Callback type used with ChooseDownloadPath(). The callback should be
   // invoked with the user-selected path as the argument. If the file selection
   // was canceled, the argument should be the empty path.
   typedef base::Callback<void(const base::FilePath&)> FileSelectedCallback;
 
   explicit ChromeDownloadManagerDelegate(Profile* profile);
 
-  static void RegisterUserPrefs(PrefRegistrySyncable* registry);
-
   // Should be called before the first call to ShouldCompleteDownload() to
   // disable SafeBrowsing checks for |item|.
   static void DisableSafeBrowsing(content::DownloadItem* item);
 
   void SetDownloadManager(content::DownloadManager* dm);
 
   // content::DownloadManagerDelegate
   virtual void Shutdown() OVERRIDE;
   virtual content::DownloadId GetNextId() OVERRIDE;
   virtual bool DetermineDownloadTarget(
@@ skipping 17 matching lines @@
       const base::FilePath& suggested_path,
       const base::FilePath::StringType& default_extension,
       bool can_save_as_complete,
       const content::SavePackagePathPickedCallback& callback) OVERRIDE;
   virtual void OpenDownload(content::DownloadItem* download) OVERRIDE;
   virtual void ShowDownloadInShell(content::DownloadItem* download) OVERRIDE;
   virtual void CheckForFileExistence(
       content::DownloadItem* download,
       const content::CheckForFileExistenceCallback& callback) OVERRIDE;
 
-  // Clears the last directory chosen by the user in response to a file chooser
-  // prompt. Called when clearing recent history.
-  void ClearLastDownloadPath();
-
   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
 
  protected:
   // So that test classes can inherit from this for override purposes.
   virtual ~ChromeDownloadManagerDelegate();
 
   // Returns the SafeBrowsing download protection service if it's
   // enabled. Returns NULL otherwise. Protected virtual for testing.
   virtual safe_browsing::DownloadProtectionService*
      GetDownloadProtectionService();
@@ skipping 125 matching lines @@
 
   // Maps from pending extension installations to DownloadItem IDs.
   typedef base::hash_map<extensions::CrxInstaller*,
       content::DownloadOpenDelayedCallback> CrxInstallerMap;
   CrxInstallerMap crx_installers_;
 
   CancelableRequestConsumer history_consumer_;
 
   content::NotificationRegistrar registrar_;
 
-  // The directory most recently chosen by the user in response to a Save As
-  // dialog for a regular download.
-  base::FilePath last_download_path_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_CHROME_DOWNLOAD_MANAGER_DELEGATE_H_