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

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

Issue 951773003: Register sync session ID in SyncController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sessions-id
Patch Set: Rebase on master. Created 5 years, 10 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/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.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 e87d454488d9172630e3bedac1a3836d6d45bb2c..1dec363ec8bd06257a78f3d2d9c59e490d9729a3 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
@@ -10,6 +10,7 @@ import android.content.Context;
import android.util.Log;
import org.chromium.base.ThreadUtils;
+import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
import org.chromium.chrome.browser.invalidation.InvalidationController;
import org.chromium.chrome.browser.signin.SigninManager;
import org.chromium.chrome.browser.signin.SigninManager.SignInFlowObserver;
@@ -60,6 +61,10 @@ public class SyncController implements ProfileSyncService.SyncStateChangedListen
mProfileSyncService = ProfileSyncService.get(mContext);
mProfileSyncService.addSyncStateChangedListener(this);
mChromeSigninController.ensureGcmIsInitialized();
+ // Since we do not override the UniqueIdentificationGenerator, we get it from the factory,
nyquist 2015/03/04 09:15:13 Do not use pronouns in comments.
maxbogue 2015/03/04 18:40:48 Hmm, that comment didn't really make sense anymore
+ // instead of using the instance we just created.
+ mProfileSyncService.setSessionsId(
+ UniqueIdentificationGeneratorFactory.getInstance(GENERATOR_ID));
}
/**
« no previous file with comments | « no previous file | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698