chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java - Issue 879533004: Rewrite AndroidSyncSettings to be significantly simpler.

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/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

Issue 879533004: Rewrite AndroidSyncSettings to be significantly simpler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@android-sync

Patch Set: Add another deprecated method for transitioning. Created 5 years, 11 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 | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java » ('j') | sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

index 2a5c4bbbf05bcded9354bce2bd0cecb14c58384b..6269c22b74d1c28d4185d2ea91135916421afcbe 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -371,7 +371,7 @@ public class SigninManager {

// Sign-in to sync.

ProfileSyncService profileSyncService = ProfileSyncService.get(mContext);

- if (AndroidSyncSettings.get(mContext).isSyncEnabled(mSignInAccount)

+ if (AndroidSyncSettings.get(mContext).isSyncEnabled()

&& !profileSyncService.hasSyncSetupCompleted()) {

profileSyncService.setSetupInProgress(true);

profileSyncService.syncSignIn();