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

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

Issue 845543005: Rename SyncStatusHelper to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gsm
Patch Set: Fix DEPS. 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/signin/SigninManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
index 6723fc9a1dafb65102e6ec2e0f44f107c3d60ca0..2a5c4bbbf05bcded9354bce2bd0cecb14c58384b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java
@@ -26,8 +26,8 @@ import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.invalidation.InvalidationController;
import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.sync.AndroidSyncSettings;
import org.chromium.sync.internal_api.pub.base.ModelType;
-import org.chromium.sync.notifier.SyncStatusHelper;
import org.chromium.sync.signin.ChromeSigninController;
import java.util.HashSet;
@@ -371,7 +371,7 @@ public class SigninManager {
// Sign-in to sync.
ProfileSyncService profileSyncService = ProfileSyncService.get(mContext);
- if (SyncStatusHelper.get(mContext).isSyncEnabled(mSignInAccount)
+ if (AndroidSyncSettings.get(mContext).isSyncEnabled(mSignInAccount)
&& !profileSyncService.hasSyncSetupCompleted()) {
profileSyncService.setSetupInProgress(true);
profileSyncService.syncSignIn();
@@ -454,8 +454,10 @@ public class SigninManager {
nativeWipeProfileData(mNativeSigninManagerAndroid);
}
- // This class must be public and static. Otherwise an exception will be thrown when Android
- // recreates the fragment (e.g. after a configuration change).
+ /**
+ * This class must be public and static. Otherwise an exception will be thrown when Android
+ * recreates the fragment (e.g. after a configuration change).
+ */
public static class ClearDataProgressDialog extends DialogFragment {
@Override
public void onCreate(Bundle savedInstanceState) {

Powered by Google App Engine
This is Rietveld 408576698