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

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

Issue 6973052: When the download folder does not exist, change the download folder to a user's "Downloads" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Remove PathServiceWrapper and add DefaultDownloadDirectory Created 9 years, 6 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
Index: chrome/browser/download/save_package.cc
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 81bdfcfdfe5a2dd5d252165196836d0e304fa532..3953ac0b2bdea35aca0c94e6090d4f93bb009b2b 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -1267,7 +1267,7 @@ void SavePackage::GetSaveInfo() {
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
NewRunnableMethod(this, &SavePackage::CreateDirectoryOnFileThread,
- website_save_dir, download_save_dir, mime_type));
+ website_save_dir, download_save_dir, mime_type));
}
void SavePackage::CreateDirectoryOnFileThread(
Paweł Hajdan Jr. 2011/06/08 09:50:23 Interesting, this code seems much duplicated betwe
haraken1 2011/06/09 10:16:56 I collected up the duplicated code into ChooseSava
@@ -1275,15 +1275,28 @@ void SavePackage::CreateDirectoryOnFileThread(
const FilePath& download_save_dir,
const std::string& mime_type) {
FilePath save_dir;
- // If the default html/websites save folder doesn't exist...
- if (!file_util::DirectoryExists(website_save_dir)) {
- // If the default download dir doesn't exist, create it.
- if (!file_util::DirectoryExists(download_save_dir))
- file_util::CreateDirectory(download_save_dir);
+ if (file_util::PathIsWritable(website_save_dir)) {
+ // If the default html/websites save folder exists,
+ // then use the default html/websites save folder.
+ save_dir = website_save_dir;
+ } else if (file_util::PathIsWritable(download_save_dir)) {
+ // If the default html/websites save folder does not exist
+ // but the default download folder exists,
+ // then use the default download folder.
save_dir = download_save_dir;
} else {
- // If it does exist, use the default save dir param.
- save_dir = website_save_dir;
+ // If both the above folders do not exist,
+ // use the user's "Downloads" folder.
+ if (!download_util::DefaultDownloadDirectory::Get(&save_dir) ||
+ !file_util::PathIsWritable(save_dir)) {
+ VLOG(1) << "Cannot find the user's writable \"Downloads\" folder.";
+ // Create the |download_save_dir| folder if we cannot get
+ // the user's writable "Downloads" folder (This will be a rare case).
+ save_dir = download_save_dir;
+ }
+ // Make sure that the folder does exist.
+ if (!file_util::CreateDirectory(save_dir))
+ LOG(ERROR) << "Failed to create " << save_dir.value();
}
bool can_save_as_complete = CanSaveAsComplete(mime_type);

Powered by Google App Engine
This is Rietveld 408576698