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..c9fd445179b58235e92ac56a929a79cd97d28523 100644
--- a/chrome/browser/download/save_package_file_picker.h
+++ b/chrome/browser/download/save_package_file_picker.h
@@ -14,12 +14,13 @@ 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,
+      const base::FilePath::StringType& default_extension_const,

[Randy Smith (Not in Mondays), 2013/05/01 19:18:43]

nit: If it's a choice between making the interface a little confusing or making
the implementation a little confusing, I'd vote for the implementation :-}.  I
don't think the _const suffices make sense except in the context of the function
definition in the .cc file, so I'd leave them off here, and either a) accept the
difference in parameter naming between decl and defn, or b) rename things in the
implementation to make more sense (e.g. renaming the copies _nonconst).

[benjhayden, 2013/05/06 20:05:19]

Done.

+      bool can_save_as_complete,
+      DownloadPrefs* download_prefs,
+      const content::SavePackagePathPickedCallback& callback);
   virtual ~SavePackageFilePicker();
 
   // Used to disable prompting the user for a directory/filename of the saved
@@ -41,6 +42,8 @@ class SavePackageFilePicker : public ui::SelectFileDialog::Listener {
   // Whether the web page can be saved as a complete HTML file.
   bool can_save_as_complete_;
 
+  DownloadPrefs* download_prefs_;
+
   content::SavePackagePathPickedCallback callback_;
 
   // For managing select file dialogs.