Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3674)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gsm
Patch Set: 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
Index: chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
index 3f953b768a228c5be82ed0c2f86e600680896933..5e19e2a6df03baab87739ebe5c328e8637ab52ac 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java
@@ -12,10 +12,10 @@ import org.chromium.base.ApplicationState;
import org.chromium.base.ApplicationStatus;
import org.chromium.base.VisibleForTesting;
import org.chromium.components.invalidation.InvalidationClientService;
+import org.chromium.sync.AndroidSyncSettings;
import org.chromium.sync.internal_api.pub.base.ModelType;
import org.chromium.sync.notifier.InvalidationIntentProtocol;
import org.chromium.sync.notifier.InvalidationPreferences;
-import org.chromium.sync.notifier.SyncStatusHelper;
import java.util.Set;
@@ -55,8 +55,8 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
InvalidationPreferences invalidationPreferences = new InvalidationPreferences(mContext);
Set<String> savedSyncedTypes = invalidationPreferences.getSavedSyncedTypes();
Account account = invalidationPreferences.getSavedSyncedAccount();
- boolean allTypes = savedSyncedTypes != null &&
- savedSyncedTypes.contains(ModelType.ALL_TYPES_TYPE);
+ boolean allTypes = savedSyncedTypes != null
+ && savedSyncedTypes.contains(ModelType.ALL_TYPES_TYPE);
setRegisteredTypes(account, allTypes, types);
}
@@ -104,7 +104,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
@Override
public void onApplicationStateChange(int newState) {
- if (SyncStatusHelper.get(mContext).isSyncEnabled()) {
+ if (AndroidSyncSettings.get(mContext).isSyncEnabled()) {
if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
start();
} else if (newState == ApplicationState.HAS_PAUSED_ACTIVITIES) {

Powered by Google App Engine
This is Rietveld 408576698