chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.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: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.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 | « chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

index f9ff389b3dad30dc1e93205821f9b4568a1a75ed..094a14b92005a936ebc995ba2be030f910c6c2d6 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

@@ -27,7 +27,6 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC

private static final String TAG = "SyncNotificationController";

private final Context mApplicationContext;

private final GoogleServicesNotificationController mNotificationController;

- private final AndroidSyncSettings mAndroidSyncSettings;

private final Class<? extends Activity> mPassphraseRequestActivity;

private final Class<? extends Fragment> mAccountManagementFragment;

private final ProfileSyncService mProfileSyncService;

@@ -38,7 +37,6 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC

mApplicationContext = context.getApplicationContext();

mNotificationController = GoogleServicesNotificationController.get(context);

mProfileSyncService = ProfileSyncService.get(context);

- mAndroidSyncSettings = AndroidSyncSettings.get(context);

mPassphraseRequestActivity = passphraseRequestActivity;

mAccountManagementFragment = accountManagementFragment;

}

@@ -62,7 +60,7 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC

Intent intent;

// Auth errors take precedence over passphrase errors.

- if (!mAndroidSyncSettings.isSyncEnabled()) {

+ if (!AndroidSyncSettings.isSyncEnabled(mApplicationContext)) {

mNotificationController.cancelNotification(NotificationConstants.NOTIFICATION_ID_SYNC);

return;

}