GData save package support with MHTML.

chrome/browser/download/chrome_download_manager_delegate.cc

 // 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/chrome_download_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 30 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/download/download_file_picker_chromeos.h"
+#include "chrome/browser/download/save_package_file_picker_chromeos.h"
 #endif
 
 using content::BrowserThread;
 using content::DownloadId;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::WebContents;
 using safe_browsing::DownloadProtectionService;
 
 namespace {
@@ skipping 249 matching lines @@
   *download_save_dir = prefs->GetFilePath(prefs::kDownloadDefaultDirectory);
 }
 
 void ChromeDownloadManagerDelegate::ChooseSavePath(
     WebContents* web_contents,
     const FilePath& suggested_path,
     const FilePath::StringType& default_extension,
     bool can_save_as_complete,
     content::SaveFilePathPickedCallback callback) {
   // Deletes itself.
-  new SavePackageFilePicker(
-      web_contents, suggested_path, default_extension, can_save_as_complete,
-      download_prefs_.get(), callback);
+#if defined(OS_CHROMEOS)
+  // Note that we're ignoring the callback here. TODO(achuith): Fix this.

[Randy Smith (Not in Mondays), 2012/03/27 17:15:46]

A little bit more information.  Maybe "... ignoring the callback here; the
SavePacakgeFilePickerChromeOS completes the save operation itself."?

+  new SavePackageFilePickerChromeOS(web_contents, suggested_path);
+#else
+  new SavePackageFilePicker(web_contents, suggested_path, default_extension,
+      can_save_as_complete, download_prefs_.get(), callback);
+#endif
 }
 
 #if defined(ENABLE_SAFE_BROWSING)
 DownloadProtectionService*
     ChromeDownloadManagerDelegate::GetDownloadProtectionService() {
   SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
   if (sb_service && sb_service->download_protection_service() &&
       profile_->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
     return sb_service->download_protection_service();
   }
@@ skipping 301 matching lines @@
     int32 download_id, int64 db_handle) {
   // It's not immediately obvious, but HistoryBackend::CreateDownload() can
   // call this function with an invalid |db_handle|. For instance, this can
   // happen when the history database is offline. We cannot have multiple
   // DownloadItems with the same invalid db_handle, so we need to assign a
   // unique |db_handle| here.
   if (db_handle == DownloadItem::kUninitializedHandle)
     db_handle = download_history_->GetNextFakeDbHandle();
   download_manager_->OnItemAddedToPersistentStore(download_id, db_handle);
 }