chrome/browser/chromeos/login/oauth2_login_manager.cc - Issue 12256046: Added interstitial page for merge session.

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

Issue 12256046: Added interstitial page for merge session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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:

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

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

index 2497fb5e4bd6d82dd1eabed657d3fdf442282a08..c719a28bbabaa4c81dadb2ccc4b5991ec68176bb 100644

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

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

@@ -242,6 +242,7 @@ void OAuth2LoginManager::OnSessionMergeSuccess() {

UMA_HISTOGRAM_ENUMERATION("OAuth2Login.SessionRestore",

SESSION_RESTORE_SUCCESS,

SESSION_RESTORE_COUNT);

+ delegate_->OnCompletedMergeSession();

}

void OAuth2LoginManager::OnSessionMergeFailure() {

@@ -253,6 +254,7 @@ void OAuth2LoginManager::OnSessionMergeFailure() {

UMA_HISTOGRAM_ENUMERATION("OAuth2Login.SessionRestore",

SESSION_RESTORE_MERGE_SESSION_FAILED,

SESSION_RESTORE_COUNT);

+ delegate_->OnCompletedMergeSession();

}

void OAuth2LoginManager::StartTokenService(