diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 06:32:59 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 06:32:59 +0000 |
| commit | e0879c19fe65c1455d6eab36a4a01524465ffb08 (patch) | |
| tree | df3400ef596ecf62cc44bbf7687417c2dcbabf3a /remoting/host | |
| parent | cee6a92d0d15ba27677d1f51c0a03d8990832445 (diff) | |
| download | chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.zip chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.tar.gz chromium_src-e0879c19fe65c1455d6eab36a4a01524465ffb08.tar.bz2 | |
Revert 270872 "Move all callers of GetHomeDir() to PathService::..."
> Move all callers of GetHomeDir() to PathService::Get(base::DIR_HOME).
>
> * Fixes GetHomeDir() for multi-profiles case on Chrome OS.
> * Once user signs in on Chrome OS base::DIR_HOME is overridden with primary user homedir.
> * Added content switch --homedir to pass that information to ppapi plugins since they run in a separate process and previous base::DIR_HOME override does not apply there.
>
> This fix doesn't require checking for --multi-profiles switch
> since user_id hash is known even without it.
>
> BUG=331530
> TBR=vitalybuka@chromium.org
>
> Review URL: https://codereview.chromium.org/200473002
This test has caused two tests to start failing on the chromeos valgrind bots:
http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%286%29/builds/25884
http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%285%29/builds/26990
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/284333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270951 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/branding.cc | 4 | ||||
| -rw-r--r-- | remoting/host/setup/daemon_controller_delegate_linux.cc | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/remoting/host/branding.cc b/remoting/host/branding.cc index fe95479..840e982 100644 --- a/remoting/host/branding.cc +++ b/remoting/host/branding.cc @@ -4,7 +4,7 @@ #include "remoting/host/branding.h" -#include "base/base_paths.h" +#include "base/file_util.h" #include "base/path_service.h" namespace { @@ -46,7 +46,7 @@ base::FilePath GetConfigDir() { #elif defined(OS_MACOSX) PathService::Get(base::DIR_APP_DATA, &app_data_dir); #else - PathService::Get(base::DIR_HOME, &app_data_dir); + app_data_dir = base::GetHomeDir(); #endif return app_data_dir.Append(kConfigDir); diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc index 4988065..427a572 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.cc +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc @@ -6,7 +6,6 @@ #include <unistd.h> -#include "base/base_paths.h" #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" @@ -17,7 +16,6 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/md5.h" -#include "base/path_service.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/process/process_handle.h" @@ -57,9 +55,8 @@ std::string GetMd5(const std::string& value) { base::FilePath GetConfigPath() { std::string filename = "host#" + GetMd5(net::GetHostName()) + ".json"; - base::FilePath homedir; - PathService::Get(base::DIR_HOME, &homedir); - return homedir.Append(".config/chrome-remote-desktop").Append(filename); + return base::GetHomeDir(). + Append(".config/chrome-remote-desktop").Append(filename); } bool GetScriptPath(base::FilePath* result) { |