chrome/browser/chromeos/login/app_launch_controller.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/app_launch_controller.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: Add missing files. 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

« chrome/browser/chromeos/attestation/attestation_policy_observer.cc ('K') | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | chrome/browser/chromeos/login/session/user_session_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/app_launch_controller.cc

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

index 057671ff5e7dba396b007835e7afab3180649040..4a3081f1bb5040d3a26503156d3b8d4c360dc86e 100644

--- a/chrome/browser/chromeos/login/app_launch_controller.cc

+++ b/chrome/browser/chromeos/login/app_launch_controller.cc

@@ -29,6 +29,7 @@

#include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

#include "chromeos/settings/cros_settings_names.h"

+#include "components/user_manager/known_user.h"

#include "components/user_manager/user_manager.h"

#include "content/public/browser/notification_service.h"

#include "extensions/browser/app_window/app_window.h"

@@ -159,9 +160,8 @@ void AppLaunchController::StartAppLaunch(bool is_auto_launch) {

if (delay == 0)

KioskAppManager::Get()->SetAppWasAutoLaunchedWithZeroDelay(app_id_);

}

kiosk_profile_loader_.reset(

- new KioskProfileLoader(app.user_id, false, this));

+ new KioskProfileLoader(app.account_id.GetUserEmail(), false, this));

xiyuan 2016/02/17 23:14:25 Update KioskProfileLoader to take AccountId as wel

Alexander Alekseev 2016/02/18 13:45:14 Done.

kiosk_profile_loader_->Start();

}