chrome/browser/chromeos/login/chrome_restart_request.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/chrome_restart_request.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/auth/cryptohome_authenticator_unittest.cc ('k') | chrome/browser/chromeos/login/crash_restore_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index cbbd8c765208f9790b5cd2f5c5035b659dc0bd6a..58c359ab372e9d06e2500143ebce43a9903065f3 100644

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

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

@@ -28,6 +28,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/url_constants.h"

#include "chromeos/chromeos_switches.h"

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

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/session_manager_client.h"

#include "chromeos/login/user_names.h"

@@ -323,8 +324,9 @@ void GetOffTheRecordCommandLine(const GURL& start_url,

otr_switches.SetString(switches::kGuestSession, std::string());

otr_switches.SetString(::switches::kIncognito, std::string());

otr_switches.SetString(::switches::kLoggingLevel, kGuestModeLoggingLevel);

- otr_switches.SetString(switches::kLoginUser,

- login::GuestAccountId().GetUserEmail());

+ otr_switches.SetString(

+ switches::kLoginUser,

+ cryptohome::Identification(login::GuestAccountId()).id());

// Override the home page.

otr_switches.SetString(::switches::kHomePage,