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 /chromeos | |
| 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 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 91c825f..4db1e3f 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -142,6 +142,9 @@ const char kHasChromeOSKeyboard[] = "has-chromeos-keyboard"; // If true, the Chromebook has a keyboard with a diamond key. const char kHasChromeOSDiamondKey[] = "has-chromeos-diamond-key"; +// Defines user homedir. This defaults to primary user homedir. +const char kHomedir[] = "homedir"; + // If true, profile selection in UserManager will always return active user's // profile. // TODO(nkostlyev): http://crbug.com/364604 - Get rid of this switch after we diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index a2a1268..1484f85 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -57,6 +57,7 @@ CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[]; CHROMEOS_EXPORT extern const char kGuestSession[]; CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[]; CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[]; +CHROMEOS_EXPORT extern const char kHomedir[]; CHROMEOS_EXPORT extern const char kIgnoreUserProfileMappingForTests[]; CHROMEOS_EXPORT extern const char kKioskModeScreensaverPath[]; CHROMEOS_EXPORT extern const char kLoginManager[]; |