sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java - Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings.

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: sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and address nit. Created 5 years, 7 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 | « sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java ('k') | sync/android/javatests/src/org/chromium/sync/AndroidSyncSettingsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

diff --git a/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java b/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

index adfd384637afe764edad09a011a127198f1ee60d..4a5e8e80f6e697d10f4cb03b83e264835ec0898d 100644

--- a/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

+++ b/sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

@@ -44,14 +44,11 @@ public class ChromeSigninController {

private final ObserverList<Listener> mListeners = new ObserverList<Listener>();

- private final AndroidSyncSettings mAndroidSyncSettings;

private boolean mGcmInitialized;

private ChromeSigninController(Context context) {

mApplicationContext = context.getApplicationContext();

- mAndroidSyncSettings = AndroidSyncSettings.get(context);

- mAndroidSyncSettings.updateAccount(getSignedInUser());

+ AndroidSyncSettings.updateAccount(context, getSignedInUser());

}

/**

@@ -86,7 +83,7 @@ public class ChromeSigninController {

.putString(SIGNED_IN_ACCOUNT_KEY, accountName)

.apply();

// TODO(maxbogue): Move this to SigninManager.

- mAndroidSyncSettings.updateAccount(getSignedInUser());

+ AndroidSyncSettings.updateAccount(mApplicationContext, getSignedInUser());

}

public void clearSignedInUser() {