Instead of appending "Downloads" to the user document directory, let each platform specify its own downloads directory.

On mac this is unimplemented. On windows it remains the user document directory + "\Downloads\", and on linux we attempt to follow their XDG setting, but fall back to ~/Downloads if they have an unsafe value in their XDG setting.

Review URL: http://codereview.chromium.org/28167

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10669 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 13 deletions

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 2c80ff3..f9c12be 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -74,19 +74,8 @@ bool PathProvider(int key, FilePath* result) {
       create_dir = true;
       break;
     case chrome::DIR_DEFAULT_DOWNLOADS:
-      // On Vista, we can get the download path using a Win API
-      // (http://msdn.microsoft.com/en-us/library/bb762584(VS.85).aspx),
-      // but it can be set to Desktop, which is dangerous. Instead,
-      // we just use 'Downloads' under DIR_USER_DOCUMENTS. Localizing
-      // 'downloads' is not a good idea because Chrome's UI language
-      // can be changed. 
-      if (!PathService::Get(chrome::DIR_USER_DOCUMENTS, &cur))
-        return false;
-      cur = cur.Append(FILE_PATH_LITERAL("Downloads"));
-      // TODO(port): this may not be what we want on other platforms. But it
-      // is not clear what we would prefer: $XDG_DOWNLOAD_DIR appears to point
-      // to ~/Downloads for many users, which is something we want to avoid.
-      // We probably need to add a GetUserDownloadsDirectory().
+      if (!GetUserDownloadsDirectory(&cur))
+        return false;
       break;
     case chrome::DIR_CRASH_DUMPS:
       // The crash reports are always stored relative to the default user data