Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/save_package_file_picker.h

Index: chrome/browser/download/save_package_file_picker.h
diff --git a/chrome/browser/download/save_package_file_picker.h b/chrome/browser/download/save_package_file_picker.h
index f697ef077061d0b5228ced9c39dda1a47e164ea5..7da5b971c0cfe8f670834084da6f1e1dd0943cea 100644
--- a/chrome/browser/download/save_package_file_picker.h
+++ b/chrome/browser/download/save_package_file_picker.h
@@ -14,12 +14,14 @@ class DownloadPrefs;
 // Handles showing a dialog to the user to ask for the filename to save a page.
 class SavePackageFilePicker : public ui::SelectFileDialog::Listener {
  public:
-  SavePackageFilePicker(content::WebContents* web_contents,
-                        const base::FilePath& suggested_path,
-                        const base::FilePath::StringType& default_extension,
-                        bool can_save_as_complete,
-                        DownloadPrefs* download_prefs,
-                        const content::SavePackagePathPickedCallback& callback);
+  SavePackageFilePicker(
+      content::WebContents* web_contents,
+      const base::FilePath& suggested_path,
+      const base::FilePath::StringType& default_extension,
+      bool can_save_as_complete,
+      DownloadPrefs* download_prefs,
+      const base::Callback<void(const base::FilePath&)>& on_chosen,
+      const content::SavePackagePathPickedCallback& callback);

[Randy Smith (Not in Mondays), 2013/04/25 17:58:55]

Documentation somewhere explaining the difference between these two callbacks?

[benjhayden, 2013/04/30 21:11:12]

Moot.

   virtual ~SavePackageFilePicker();
 
   // Used to disable prompting the user for a directory/filename of the saved
@@ -41,6 +43,8 @@ class SavePackageFilePicker : public ui::SelectFileDialog::Listener {
   // Whether the web page can be saved as a complete HTML file.
   bool can_save_as_complete_;
 
+  base::Callback<void(const base::FilePath&)> on_chosen_;
+
   content::SavePackagePathPickedCallback callback_;
 
   // For managing select file dialogs.