| Index: chrome/common/chrome_paths_linux.cc
|
| diff --git a/chrome/common/chrome_paths_linux.cc b/chrome/common/chrome_paths_linux.cc
|
| index eeb1b9ac635e39cae14fc272f2b4cc1e7d70d416..95dd08697187ec06a4225e28701b9fabc8f5b271 100644
|
| --- a/chrome/common/chrome_paths_linux.cc
|
| +++ b/chrome/common/chrome_paths_linux.cc
|
| @@ -4,11 +4,13 @@
|
|
|
| #include "chrome/common/chrome_paths_internal.h"
|
|
|
| +#include "base/base_paths.h"
|
| #include "base/environment.h"
|
| #include "base/file_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/nix/xdg_util.h"
|
| #include "base/path_service.h"
|
| +#include "chrome/common/chrome_paths.h"
|
|
|
| namespace chrome {
|
|
|
| @@ -34,7 +36,8 @@ bool GetUserMediaDirectory(const std::string& xdg_name,
|
| #else
|
| *result = GetXDGUserDirectory(xdg_name.c_str(), fallback_name.c_str());
|
|
|
| - base::FilePath home = base::GetHomeDir();
|
| + base::FilePath home;
|
| + PathService::Get(base::DIR_HOME, &home);
|
| if (*result != home) {
|
| base::FilePath desktop;
|
| if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop))
|
| @@ -103,7 +106,8 @@ bool GetUserDocumentsDirectory(base::FilePath* result) {
|
| }
|
|
|
| bool GetUserDownloadsDirectorySafe(base::FilePath* result) {
|
| - base::FilePath home = base::GetHomeDir();
|
| + base::FilePath home;
|
| + PathService::Get(base::DIR_HOME, &home);
|
| *result = home.Append(kDownloadsDir);
|
| return true;
|
| }
|
|
|