← Back to branch summary

~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_dont_overwrite_default_download_directory.patch

* Merge with chromium-browser.stable #583

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_dont_overwrite_default_download_directory.patch
13
13
 }
14
14
 
15
15
 bool GetUserDocumentsDirectory(FilePath* result) {
16
 
   scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
 
16
   scoped_ptr<base::Environment> env(base::Environment::Create());
17
17
   *result = base::GetXDGUserDirectory(env.get(), "DOCUMENTS", "Documents");
18
18
   return true;
19
19
 }
21
21
-// We respect the user's preferred download location, unless it is
22
22
-// ~ or their desktop directory, in which case we default to ~/Downloads.
23
23
 bool GetUserDownloadsDirectory(FilePath* result) {
24
 
   scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
 
24
   scoped_ptr<base::Environment> env(base::Environment::Create());
25
25
   *result = base::GetXDGUserDirectory(env.get(), "DOWNLOAD", "Downloads");
26
26
-
27
27
-  FilePath home = file_util::GetHomeDir();
40
40
 }
41
41
 
42
42
 bool GetUserDesktop(FilePath* result) {
43
 
   scoped_ptr<base::EnvVarGetter> env(base::EnvVarGetter::Create());
 
43
   scoped_ptr<base::Environment> env(base::Environment::Create());
44
44
   *result = base::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
45
45
   return true;
46
46
 }