Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2690)

Unified Diff: chrome/browser/download/download_prefs.cc

Issue 7324031: Revert 91861 - When the download folder does not exist, change the download folder to a user's "D... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/download/download_manager_unittest.cc ('k') | chrome/browser/download/download_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/download/download_prefs.cc
===================================================================
--- chrome/browser/download/download_prefs.cc (revision 91868)
+++ chrome/browser/download/download_prefs.cc (working copy)
@@ -60,18 +60,18 @@
SavePackage::SAVE_AS_COMPLETE_HTML,
PrefService::UNSYNCABLE_PREF);
- // The user's default "Downloads" folder.
- FilePath default_download_dir =
- download_util::GetDefaultDownloadDirectoryFromPathService();
+ // The default download path is userprofile\download.
+ const FilePath& default_download_path =
+ download_util::GetDefaultDownloadDirectory();
prefs->RegisterFilePathPref(prefs::kDownloadDefaultDirectory,
- default_download_dir,
+ default_download_path,
PrefService::UNSYNCABLE_PREF);
#if defined(OS_CHROMEOS)
// Ensure that the download directory specified in the preferences exists.
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
- NewRunnableFunction(&file_util::CreateDirectory, default_download_dir));
+ NewRunnableFunction(&file_util::CreateDirectory, default_download_path));
#endif // defined(OS_CHROMEOS)
// If the download path is dangerous we forcefully reset it. But if we do
@@ -82,7 +82,7 @@
prefs::kDownloadDefaultDirectory);
if (download_util::DownloadPathIsDangerous(current_download_dir)) {
prefs->SetFilePath(prefs::kDownloadDefaultDirectory,
- default_download_dir);
+ default_download_path);
}
prefs->SetBoolean(prefs::kDownloadDirUpgraded, true);
}
« no previous file with comments | « chrome/browser/download/download_manager_unittest.cc ('k') | chrome/browser/download/download_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698