chrome/browser/chromeos/login/signin/oauth2_login_manager.cc - Issue 384973004: Introduce disable-gaia-services for fake telemetry login.

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/signin/oauth2_login_manager.cc

Issue 384973004: Introduce disable-gaia-services for fake telemetry login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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/login/enrollment/auto_enrollment_controller.cc ('K') | « chrome/browser/chromeos/login/session/user_session_manager.cc ('k') | chromeos/chromeos_switches.h » ('j') | chromeos/chromeos_switches.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

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

index c6a3fe826dc9f326f926a939d82984df110d9317..87dd0acc21c932849e0e4d9d03b7fb4098ca1997 100644

--- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

+++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

@@ -40,10 +40,11 @@ OAuth2LoginManager::OAuth2LoginManager(Profile* user_profile)

restore_strategy_(RESTORE_FROM_COOKIE_JAR),

state_(SESSION_RESTORE_NOT_STARTED) {

GetTokenService()->AddObserver(this);

+ // For telemetry, we mark session restore completed to avoid warnings from

+ // MergeSessionThrottle.

if (CommandLine::ForCurrentProcess()->

- HasSwitch(chromeos::switches::kOobeSkipPostLogin)) {

- // For telemetry we should mark session restore completed to avoid

- // warnings from MergeSessionThrottle.

+ HasSwitch(chromeos::switches::kDisableSessionRestore)) {

SetSessionRestoreState(SESSION_RESTORE_DONE);

}