diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:20:32 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 00:20:32 +0000 |
| commit | 96a8fa1b58b726ad19c7b86c28b2770d69fa73f6 (patch) | |
| tree | 0144e9f5270f027372348b801a5975ef1492c756 /remoting/host | |
| parent | 8afc64910396ff88dcafd306b0a7aeb96000bf63 (diff) | |
| download | chromium_src-96a8fa1b58b726ad19c7b86c28b2770d69fa73f6.zip chromium_src-96a8fa1b58b726ad19c7b86c28b2770d69fa73f6.tar.gz chromium_src-96a8fa1b58b726ad19c7b86c28b2770d69fa73f6.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270872 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, 7 insertions, 4 deletions
diff --git a/remoting/host/branding.cc b/remoting/host/branding.cc index 840e982..fe95479 100644 --- a/remoting/host/branding.cc +++ b/remoting/host/branding.cc @@ -4,7 +4,7 @@ #include "remoting/host/branding.h" -#include "base/file_util.h" +#include "base/base_paths.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 - app_data_dir = base::GetHomeDir(); + PathService::Get(base::DIR_HOME, &app_data_dir); #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 427a572..4988065 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.cc +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc @@ -6,6 +6,7 @@ #include <unistd.h> +#include "base/base_paths.h" #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" @@ -16,6 +17,7 @@ #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" @@ -55,8 +57,9 @@ std::string GetMd5(const std::string& value) { base::FilePath GetConfigPath() { std::string filename = "host#" + GetMd5(net::GetHostName()) + ".json"; - return base::GetHomeDir(). - Append(".config/chrome-remote-desktop").Append(filename); + base::FilePath homedir; + PathService::Get(base::DIR_HOME, &homedir); + return homedir.Append(".config/chrome-remote-desktop").Append(filename); } bool GetScriptPath(base::FilePath* result) { |