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

Unified Diff: chrome/common/chrome_paths_linux.cc

Issue 10958009: Revert 157667 - Add new PathService paths for Windows' All Users Desktop and Quick Launch folders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/common/chrome_paths_internal.h ('k') | chrome/common/chrome_paths_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths_linux.cc
===================================================================
--- chrome/common/chrome_paths_linux.cc (revision 157679)
+++ chrome/common/chrome_paths_linux.cc (working copy)
@@ -37,8 +37,7 @@
FilePath home = file_util::GetHomeDir();
if (*result != home) {
FilePath desktop;
- if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop))
- return false;
+ GetUserDesktop(&desktop);
if (*result != desktop) {
return true;
}
@@ -143,6 +142,11 @@
return GetUserMediaDirectory("VIDEOS", kVideosDir, result);
}
+bool GetUserDesktop(FilePath* result) {
+ *result = GetXDGUserDirectory("DESKTOP", "Desktop");
+ return true;
+}
+
bool ProcessNeedsProfileDir(const std::string& process_type) {
// For now we have no reason to forbid this on Linux as we don't
// have the roaming profile troubles there. Moreover the Linux breakpad needs
« no previous file with comments | « chrome/common/chrome_paths_internal.h ('k') | chrome/common/chrome_paths_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698