Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/download_prefs.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/download_prefs.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 38 matching lines @@
         prefs::kDownloadDefaultDirectory);
     if (download_util::DownloadPathIsDangerous(current_download_dir)) {
       prefs->SetFilePath(prefs::kDownloadDefaultDirectory,
                          download_util::GetDefaultDownloadDirectory());
     }
     prefs->SetBoolean(prefs::kDownloadDirUpgraded, true);
   }
 
   prompt_for_download_.Init(prefs::kPromptForDownload, prefs);
   download_path_.Init(prefs::kDownloadDefaultDirectory, prefs);
+  save_file_path_.Init(prefs::kSaveFileDefaultDirectory, prefs);
   save_file_type_.Init(prefs::kSaveFileType, prefs);
+  incognito_save_file_path_ = *save_file_path_;
 
   // We store any file extension that should be opened automatically at
   // download completion in this pref.
   std::string extensions_to_open =
       prefs->GetString(prefs::kDownloadExtensionsToOpen);
   std::vector<std::string> extensions;
   base::SplitString(extensions_to_open, ':', &extensions);
 
   for (size_t i = 0; i < extensions.size(); ++i) {
 #if defined(OS_POSIX)
@@ skipping 30 matching lines @@
       content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // The default download path is userprofile\download.
   const base::FilePath& default_download_path =
       download_util::GetDefaultDownloadDirectory();
   registry->RegisterFilePathPref(
       prefs::kDownloadDefaultDirectory,
       default_download_path,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterFilePathPref(
+      prefs::kSaveFileDefaultDirectory,
+      default_download_path,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
 #if defined(OS_CHROMEOS)
   // Ensure that the download directory specified in the preferences exists.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(base::IgnoreResult(&file_util::CreateDirectory),
                  default_download_path));
 #endif  // defined(OS_CHROMEOS)
 }
 
@@ skipping 17 matching lines @@
   // If the download path is under /drive, and DriveSystemService isn't
   // available (which it isn't for incognito mode, for instance), use the
   // default download directory (/Downloads).
   if (drive::util::IsUnderDriveMountPoint(*download_path_) &&
       !drive::DriveSystemServiceFactory::GetForProfile(profile_))
     return download_util::GetDefaultDownloadDirectory();
 #endif
   return *download_path_;
 }
 
+void DownloadPrefs::SetDownloadPath(const base::FilePath& path) {
+  download_path_.SetValue(path);

[asanka, 2013/05/07 15:15:12]

Suggestion: Should this also set save_file_path_ ? The new behavior of
save_file_path_ requires that it be changed whenever download_path_ changes.
Perhaps that responsibility should be internal to DownloadPrefs.

[benjhayden, 2013/05/17 20:31:54]

Done.

+}
+
+base::FilePath DownloadPrefs::SaveFilePath() const {
+  return profile_->IsOffTheRecord() ? incognito_save_file_path_ :
+    *save_file_path_;
+}
+
+void DownloadPrefs::SetSaveFilePath(const base::FilePath& path) {
+  if (path == SaveFilePath())
+    return;
+  if (profile_->IsOffTheRecord()) {

[asanka, 2013/05/07 15:15:12]

Does this need to be handled this way? Isn't the incognito profile's
OverlayUserPrefStore effectively doing the same thing?

[benjhayden, 2013/05/17 20:31:54]

This is necessary. Without incognito_save_file_path_, saving a page to
secret/directory/ in incognito will cause the on-record save_file_path_ to be
secret/directory/.
I'm still investigating why OverlayUserPrefStore isn't doing this for us.

+    incognito_save_file_path_ = path;
+  } else {
+    save_file_path_.SetValue(path);
+  }
+}
+
+void DownloadPrefs::SetSaveFileType(int type) {
+  save_file_type_.SetValue(type);
+}
+
 bool DownloadPrefs::PromptForDownload() const {
   // If the DownloadDirectory policy is set, then |prompt_for_download_| should
   // always be false.
   DCHECK(!download_path_.IsManaged() || !prompt_for_download_.GetValue());
   return *prompt_for_download_;
 }
 
 bool DownloadPrefs::IsDownloadPathManaged() const {
   return download_path_.IsManaged();
 }
@@ skipping 57 matching lines @@
     extensions.erase(extensions.size() - 1);
 
   profile_->GetPrefs()->SetString(prefs::kDownloadExtensionsToOpen, extensions);
 }
 
 bool DownloadPrefs::AutoOpenCompareFunctor::operator()(
     const base::FilePath::StringType& a,
     const base::FilePath::StringType& b) const {
   return base::FilePath::CompareLessIgnoreCase(a, b);
 }