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 /chromeos | |
| 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 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 4db1e3f..91c825f 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -142,9 +142,6 @@ 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 1484f85..a2a1268 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -57,7 +57,6 @@ 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[]; |