diff options
| author | alemate <alemate@chromium.org> | 2016-03-04 02:39:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-04 10:41:09 +0000 |
| commit | 627f65303a4a1a6b4d1beb62c9ea5b6ed5affda7 (patch) | |
| tree | 5b57e0a8999752be8165706373ba5abfe5851729 /chrome/browser/ui/startup/startup_browser_creator.cc | |
| parent | 0cdae918ae7ffe4d4046027182807b9d99b6b719 (diff) | |
| download | chromium_src-627f65303a4a1a6b4d1beb62c9ea5b6ed5affda7.zip chromium_src-627f65303a4a1a6b4d1beb62c9ea5b6ed5affda7.tar.gz chromium_src-627f65303a4a1a6b4d1beb62c9ea5b6ed5affda7.tar.bz2 | |
ChromeOS cryptohome should be able to use gaia id as user identifier.
This CL adds support for using Gaia ID as cryptohome identifier.
BUG=462823
TEST=unit tests
Review URL: https://codereview.chromium.org/1693383003
Cr-Commit-Position: refs/heads/master@{#379262}
Diffstat (limited to 'chrome/browser/ui/startup/startup_browser_creator.cc')
| -rw-r--r-- | chrome/browser/ui/startup/startup_browser_creator.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index a03c8e0..3eb74b0 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -87,6 +87,7 @@ #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chromeos/chromeos_switches.h" +#include "chromeos/cryptohome/cryptohome_parameters.h" #include "components/user_manager/user_manager.h" #endif @@ -662,7 +663,9 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( // possible. We should instead cleanly exit and go back to the OOBE screen, // where we will launch again after the timeout has expired. if (chromeos::DemoAppLauncher::IsDemoAppSession( - command_line.GetSwitchValueASCII(chromeos::switches::kLoginUser))) { + cryptohome::Identification::FromString( + command_line.GetSwitchValueASCII(chromeos::switches::kLoginUser)) + .GetAccountId())) { chrome::AttemptUserExit(); return false; } |