chrome/browser/ui/sync/one_click_signin_sync_starter.cc - Issue 1104153002: Expose ReconcilorState. Rename MergeSession in Signin Tracker.

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/ui/sync/one_click_signin_sync_starter.cc

Issue 1104153002: Expose ReconcilorState. Rename MergeSession in Signin Tracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: VLOGging the reconcilor Created 5 years, 8 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/ui/sync/one_click_signin_sync_starter.h ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc

diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

index 9c347baa287718c2ce0f9f0063f11904ebbe8513..10f04cbfc02e0cfc80b730218b6f158ebfb2ad78 100644

--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

@@ -432,9 +432,9 @@ void OneClickSigninSyncStarter::SigninFailed(

void OneClickSigninSyncStarter::SigninSuccess() {

}

-void OneClickSigninSyncStarter::MergeSessionComplete(

+void OneClickSigninSyncStarter::AccountAddedToCookie(

const GoogleServiceAuthError& error) {

- // Regardless of whether the merge session completed sucessfully or not,

+ // Regardless of whether the account was successfully added or not,

// continue with sync starting.

if (!sync_setup_completed_callback_.is_null())