chrome/browser/chromeos/login/demo_mode/demo_app_launcher.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/demo_mode/demo_app_launcher.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/demo_mode/demo_app_launcher.h ('k') | chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

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

index e5f452cd129b6a91b67ec5976d3c8e8ab78e87b5..5c9c45d597d75813fa060f3da410ae6039fc256b 100644

--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc

@@ -49,14 +49,14 @@ DemoAppLauncher::~DemoAppLauncher() {

void DemoAppLauncher::StartDemoAppLaunch() {

DVLOG(1) << "Launching demo app...";

// user_id = DemoAppUserId, force_emphemeral = true, delegate = this.

- kiosk_profile_loader_.reset(new KioskProfileLoader(

- login::DemoAccountId().GetUserEmail(), true, this));

+ kiosk_profile_loader_.reset(

+ new KioskProfileLoader(login::DemoAccountId(), true, this));

kiosk_profile_loader_->Start();

}

// static

-bool DemoAppLauncher::IsDemoAppSession(const std::string& user_id) {

- return user_id == login::DemoAccountId().GetUserEmail();

+bool DemoAppLauncher::IsDemoAppSession(const AccountId& account_id) {

+ return account_id == login::DemoAccountId();

}

// static