Save Page As MHTML

content/public/browser/download_manager_delegate.h

Index: content/public/browser/download_manager_delegate.h
diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h
index 6cc557c6de7a88e5cdbb41f3d5fa28243a551653..5d29627017956ae6a20f7b78730805021c8d93ac 100644
--- a/content/public/browser/download_manager_delegate.h
+++ b/content/public/browser/download_manager_delegate.h
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_path.h"
+#include "base/logging.h"
 #include "base/time.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/save_page_type.h"
@@ -19,13 +20,20 @@ class DownloadId;
 class DownloadItem;
 class WebContents;
 
-typedef base::Callback<void(const FilePath&, content::SavePageType)>
+// Called by SavePackage when it creates a DownloadItem.
+typedef base::Callback<void(DownloadItem*)>
+    SaveFileDownloadCreatedCallback;
+
+// Called by SavePackageFilePicker when the user picks a filename.

[Randy Smith (Not in Mondays), 2012/05/01 17:53:50]

I think I'd like to rephrase and amplify this comment.  I don't think the DMD
should have references to the SavePackageFilePicker; that's an implementation
detail of the CDMD.  Instead, I'd say something like "Will be called
asynchronously with the results of the ChooseSavePath operation.  If the
delegate wants notification of the download item created in response to this
operation, the SaveFileDownloadCreatedCallback will be non-null."

(Except that similarly to "DMD shouldn't refer to the SavePackageFilePicker",
DMD also shouldn't refer to SaveFilePathPicked.  Maybe just
DownloadCreatedCallback and ChooseSavePathCallback?)

[benjhayden, 2012/05/01 18:34:59]

Done.

+typedef base::Callback<void(const FilePath&,
+                            content::SavePageType,
+                            const SaveFileDownloadCreatedCallback&)>
     SaveFilePathPickedCallback;
 
 // Browser's download manager: manages all downloads and destination view.
 class CONTENT_EXPORT DownloadManagerDelegate {
  public:
-  virtual ~DownloadManagerDelegate() {}
+  virtual ~DownloadManagerDelegate();
 
   // Lets the delegate know that the download manager is shutting down.
   virtual void Shutdown() {}
@@ -109,14 +117,13 @@ class CONTENT_EXPORT DownloadManagerDelegate {
                           FilePath* download_save_dir) {}
 
   // Asks the user for the path to save a page. The delegate calls the callback
-  // to give the answer, except on ChromeOS, where the saving is done by
-  // SavePackageFilePickerChromeOS. TODO(achuith): Move ChromeOS save
-  // functionality to SavePackage.
+  // to give the answer.
   virtual void ChooseSavePath(WebContents* web_contents,
                               const FilePath& suggested_path,
                               const FilePath::StringType& default_extension,
                               bool can_save_as_complete,
-                              SaveFilePathPickedCallback callback) {}
+                              const SaveFilePathPickedCallback& callback) {
+  }
 };
 
 }  // namespace content