GData save package support with MHTML.

chrome/browser/download/save_package_file_picker_chromeos.cc

Index: chrome/browser/download/save_package_file_picker_chromeos.cc
===================================================================
--- chrome/browser/download/save_package_file_picker_chromeos.cc	(revision 0)
+++ chrome/browser/download/save_package_file_picker_chromeos.cc	(revision 0)
@@ -0,0 +1,113 @@
+// 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.
+
+#include "chrome/browser/download/save_package_file_picker_chromeos.h"
+
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
+#include "chrome/browser/chromeos/gdata/gdata_file_system.h"
+#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
+#include "chrome/browser/chromeos/gdata/gdata_uploader.h"
+#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/profiles/profile.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/web_contents.h"
+
+using content::BrowserThread;
+
+SavePackageFilePickerChromeOS::SavePackageFilePickerChromeOS(
+    content::WebContents* web_contents,
+    const FilePath& suggested_path,
+    const FilePath::StringType& default_extension,
+    bool can_save_as_complete,
+    DownloadPrefs* download_prefs,
+    content::SaveFilePathPickedCallback callback) :
+        SavePackageFilePicker(web_contents, suggested_path, default_extension,
+                              can_save_as_complete, download_prefs, callback),
+        content::WebContentsObserver(web_contents) {
+}
+
+SavePackageFilePickerChromeOS::~SavePackageFilePickerChromeOS() {
+}
+
+void SavePackageFilePickerChromeOS::FileSelected(const FilePath& path,
+                                                 int index,
+                                                 void* params) {
+  if (!web_contents()) {

[Randy Smith (Not in Mondays), 2012/03/26 21:08:33]

It looks to me (WebContentsObserver::TabContentsDestroyed) that this can become
null in normal operation if you race with tab destruction.  If you agree, you
should handle that case (which I think means pulling the NOTREACHED() and
deleting this?).

[achuithb, 2012/03/26 21:35:54]

Yup. Done.

+    NOTREACHED();
+    return;
+  }
+
+  gdata::GDataFileSystem* gdata_filesystem = GetGDataFileSystem();
+  if (gdata_filesystem && gdata::util::IsUnderGDataMountPoint(path)) {
+    FilePath gdata_tmp_download_dir =
+        gdata_filesystem->GetGDataTempDownloadFolderPath();
+
+    selected_path_ = path;
+    FilePath* gdata_tmp_download_path = new FilePath();
+    BrowserThread::GetBlockingPool()->PostTaskAndReply(FROM_HERE,
+        base::Bind(&gdata::GDataDownloadObserver::GetGDataTempDownloadPath,
+                   gdata_tmp_download_dir,
+                   gdata_tmp_download_path),
+        base::Bind(&SavePackageFilePickerChromeOS::GenerateMHTML,
+                   base::Unretained(this),
+                   base::Owned(gdata_tmp_download_path)));
+  } else {
+    DVLOG(1) << "SavePackageFilePickerChromeOS non-gdata file";
+    SavePackageFilePicker::FileSelected(path, index, params);

[Randy Smith (Not in Mondays), 2012/03/26 21:08:33]

It looks like you haven't incorporated Zel's comment, and I didn't see a comment
in the stream responding to it.  What's the status of saving MHTML always in
ChromeOS whether or not we're going to GDrive?

[achuithb, 2012/03/26 21:35:54]

It's done now.

+  }
+}
+
+void SavePackageFilePickerChromeOS::GenerateMHTML(
+    FilePath* gdata_tmp_download_path) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (!web_contents()) {
+    NOTREACHED();
+    return;
+  }
+
+  DVLOG(1) << "GenerateMHTML " << gdata_tmp_download_path->value();
+  web_contents()->GenerateMHTML(*gdata_tmp_download_path,
+      base::Bind(&SavePackageFilePickerChromeOS::OnMHTMLGenerated,
+                 base::Unretained(this)));
+}
+
+void SavePackageFilePickerChromeOS::OnMHTMLGenerated(const FilePath& src_path,
+                                                   int64 file_size) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (!web_contents()) {
+    NOTREACHED();
+    return;
+  }
+
+  DVLOG(1) << "TransferFile from " << src_path.value()
+           << " to " << selected_path_.value();
+  gdata::GDataFileSystem* gdata_filesystem = GetGDataFileSystem();
+  if (gdata_filesystem) {
+    gdata_filesystem->TransferFile(src_path, selected_path_,
+        base::Bind(&SavePackageFilePickerChromeOS::OnTransferFile,
+                   base::Unretained(this)));
+  }
+}
+
+void SavePackageFilePickerChromeOS::OnTransferFile(
+    base::PlatformFileError error) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_EQ(error, base::PLATFORM_FILE_OK);
+  delete this;
+}
+
+gdata::GDataFileSystem*
+SavePackageFilePickerChromeOS::GetGDataFileSystem() {
+  DCHECK(web_contents());
+  Profile* profile = Profile::FromBrowserContext(
+      web_contents()->GetBrowserContext());
+  DCHECK(profile);
+  gdata::GDataSystemService* system_service =
+      gdata::GDataSystemServiceFactory::GetForProfile(profile);
+  // system_service is NULL in incognito.
+  return system_service ? system_service->file_system() : NULL;
+}
Property changes on: chrome/browser/download/save_package_file_picker_chromeos.cc
___________________________________________________________________
Added: svn:eol-style
   + LF