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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

Issue 1081283003: [Sync] Fix invalidations on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove other call. 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 | « no previous file | chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
index 0a5d8693e8f2e9fcc64352c65a7cb7bbffcf9947..894f541a75f7720bcdad787743918a38d95c3e33 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java
@@ -82,6 +82,8 @@ public class SyncController implements ApplicationStateListener,
mProfileSyncService = ProfileSyncService.get(mContext);
mProfileSyncService.addSyncStateChangedListener(this);
+ mChromeSigninController.ensureGcmIsInitialized();
+
// Set the sessions ID using the generator that was registered for GENERATOR_ID.
mProfileSyncService.setSessionsId(
UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID));
@@ -262,7 +264,6 @@ public class SyncController implements ApplicationStateListener,
private void onFirstStart() {
if (mAndroidSyncSettings.isSyncEnabled()) {
- mChromeSigninController.ensureGcmIsInitialized();
InvalidationController controller = InvalidationController.get(mContext);
controller.refreshRegisteredTypes(mProfileSyncService.getPreferredDataTypes());
}
« no previous file with comments | « no previous file | chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698