Index: chrome/common/chrome_paths_linux.cc |
diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc |
index 321032f80a59bcde1af228b3088b0d43d7c01871..babb501d0734f9fc71284b9620463d85c1dce38e 100644 |
--- a/chrome/common/chrome_paths_linux.cc |
+++ b/chrome/common/chrome_paths_linux.cc |
@@ -37,7 +37,8 @@ bool GetUserMediaDirectory(const std::string& xdg_name, |
FilePath home = file_util::GetHomeDir(); |
if (*result != home) { |
FilePath desktop; |
- GetUserDesktop(&desktop); |
+ if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop)) |
+ return false; |
if (*result != desktop) { |
return true; |
} |
@@ -142,11 +143,6 @@ bool GetUserVideosDirectory(FilePath* result) { |
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 |