chrome/browser/chromeos/login/session/chrome_session_manager.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/session/chrome_session_manager.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed unit tests. Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/session/chrome_session_manager.cc

diff --git a/chrome/browser/chromeos/login/session/chrome_session_manager.cc b/chrome/browser/chromeos/login/session/chrome_session_manager.cc

index 1802d82e533a5dd4f4164ff25de070d90cb95ac9..1039a403af9bb7dedd1ab64a61dcd1abbc813d2c 100644

--- a/chrome/browser/chromeos/login/session/chrome_session_manager.cc

+++ b/chrome/browser/chromeos/login/session/chrome_session_manager.cc

@@ -16,6 +16,7 @@

#include "chrome/browser/chromeos/login/session/stub_login_session_manager_delegate.h"

#include "chrome/browser/profiles/profile.h"

#include "chromeos/chromeos_switches.h"

+#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/login/user_names.h"

#include "components/signin/core/account_id/account_id.h"

@@ -45,8 +46,10 @@ ChromeSessionManager::CreateSessionManager(

bool force_login_screen_in_test =

parsed_command_line.HasSwitch(switches::kForceLoginManagerInTests);

- const AccountId login_account_id(AccountId::FromUserEmail(

- parsed_command_line.GetSwitchValueASCII(switches::kLoginUser)));

+ const std::string cryptohome_id =

+ parsed_command_line.GetSwitchValueASCII(switches::kLoginUser);

+ const AccountId login_account_id(

+ cryptohome::Identification::FromString(cryptohome_id).GetAccountId());

KioskAppManager::RemoveObsoleteCryptohomes();