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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java

Issue 1247853007: [Sync] Add auto-generated ModelType in Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SYNC_EXPORT and rebase. Created 5 years, 5 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/signin/SigninHelper.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
index 4e6555065895a8f778127bf309e49845797eccca..c87e2130df590cc97946b078b07cda72e9dfdf02 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java
@@ -24,7 +24,6 @@ import org.chromium.chrome.browser.signin.SigninManager.SignInFlowObserver;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.browser.sync.SyncController;
import org.chromium.sync.AndroidSyncSettings;
-import org.chromium.sync.internal_api.pub.base.ModelType;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.sync.signin.ChromeSigninController;
@@ -233,7 +232,7 @@ public class SigninHelper {
// Before signing out, remember the current sync state and data types.
final boolean isSyncWanted = AndroidSyncSettings.isChromeSyncEnabled(mContext);
- final Set<ModelType> dataTypes = mProfileSyncService.getPreferredDataTypes();
+ final Set<Integer> dataTypes = mProfileSyncService.getPreferredDataTypes();
// TODO(acleung): Deal with passphrase or just prompt user to re-enter it?
@@ -253,7 +252,7 @@ public class SigninHelper {
private void performResignin(String newName,
final boolean isSyncWanted,
- final Set<ModelType> dataTypes) {
+ final Set<Integer> dataTypes) {
// This is the correct account now.
final Account account = AccountManagerHelper.createAccountFromName(newName);

Powered by Google App Engine
This is Rietveld 408576698