chrome/browser/chromeos/chrome_browser_main_chromeos.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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/chrome_browser_main_chromeos.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('K') | « chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc ('k') | chrome/browser/chromeos/drive/fake_file_system.h » ('j') | chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

index a69241bb3b403f0da6d5463ef126a0229bbbc9b0..fbd4d23c510bdea3147268485da8a16ba74ca0fe 100644

--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -281,7 +281,7 @@ void ChromeBrowserMainPartsChromeos::PreEarlyInitialization() {

!parsed_command_line().HasSwitch(switches::kLoginUser) &&

!parsed_command_line().HasSwitch(switches::kGuestSession)) {

singleton_command_line->AppendSwitchASCII(switches::kLoginUser,

- chromeos::login::kStubUser);

+ chromeos::login::GetStubUserID().GetUserEmail());

if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) {

singleton_command_line->AppendSwitchASCII(switches::kLoginProfile,

chrome::kTestUserProfileDir);

@@ -450,8 +450,8 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {

ChromeBrowserMainPartsLinux::PreProfileInit();

if (immediate_login) {

- const std::string user_id = login::CanonicalizeUserID(

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

+ const user_manager::UserID user_id(std::string() /* gaia_id */, login::CanonicalizeUserID(

Denis Kuznetsov (DE-MUC) 2015/06/10 16:50:45 FromUserEmail()

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

user_manager::UserManager* user_manager = user_manager::UserManager::Get();

if (policy::IsDeviceLocalAccountUser(user_id, NULL) &&

@@ -470,7 +470,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {

std::string user_id_hash =

parsed_command_line().GetSwitchValueASCII(switches::kLoginProfile);

user_manager->UserLoggedIn(user_id, user_id_hash, true);

- VLOG(1) << "Relaunching browser for user: " << user_id

+ VLOG(1) << "Relaunching browser for user: " << user_id.Serialize()

Denis Kuznetsov (DE-MUC) 2015/06/10 16:50:45 Not sure that Serialize() method is suitable for l

<< " with hash: " << user_id_hash;

}