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 /crypto/nss_util.cc | |
| 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 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index da46b63..5958ad9 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -21,6 +21,7 @@ #include <map> #include <vector> +#include "base/base_paths.h" #include "base/bind.h" #include "base/cpu.h" #include "base/debug/alias.h" @@ -34,6 +35,7 @@ #include "base/message_loop/message_loop.h" #include "base/metrics/histogram.h" #include "base/native_library.h" +#include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_checker.h" @@ -80,7 +82,8 @@ std::string GetNSSErrorMessage() { #if defined(USE_NSS) base::FilePath GetDefaultConfigDirectory() { - base::FilePath dir = base::GetHomeDir(); + base::FilePath dir; + PathService::Get(base::DIR_HOME, &dir); if (dir.empty()) { LOG(ERROR) << "Failed to get home directory."; return dir; |