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

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

Issue 887143002: Completely remove SyncStatusHelper. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.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/signin/AccountManagementFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
index efbdb22c16f998561b8a1cb9b7e611d94aac9e7c..82de70c477f0926c520bf5277f0a5550d91f16bb 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java
@@ -46,7 +46,7 @@ import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
import org.chromium.chrome.browser.sync.GoogleServiceAuthError;
import org.chromium.chrome.browser.sync.ProfileSyncService;
import org.chromium.chrome.browser.sync.ProfileSyncService.SyncStateChangedListener;
-import org.chromium.sync.notifier.SyncStatusHelper;
+import org.chromium.sync.AndroidSyncSettings;
import org.chromium.sync.signin.AccountManagerHelper;
import org.chromium.sync.signin.ChromeSigninController;
@@ -388,7 +388,7 @@ public class AccountManagementFragment extends PreferenceFragment
ProfileAccountManagementMetrics.CLICK_PRIMARY_ACCOUNT,
mGaiaServiceType);
- if (SyncStatusHelper.get(activity).isMasterSyncAutomaticallyEnabled()) {
+ if (AndroidSyncSettings.get(activity).isMasterSyncEnabled()) {
getDelegate().openSyncCustomizationFragment(activity, account);
} else {
Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
@@ -470,7 +470,7 @@ public class AccountManagementFragment extends PreferenceFragment
ChromeSigninController signinController = ChromeSigninController.get(activity);
if (!signinController.isSignedIn()) return "";
- SyncStatusHelper syncStatusHelper = SyncStatusHelper.get(activity);
+ AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(activity);
ProfileSyncService profileSyncService = ProfileSyncService.get(activity);
Resources res = activity.getResources();
@@ -478,7 +478,7 @@ public class AccountManagementFragment extends PreferenceFragment
return res.getString(R.string.kids_account);
}
- if (!syncStatusHelper.isMasterSyncAutomaticallyEnabled()) {
+ if (!androidSyncSettings.isMasterSyncEnabled()) {
return res.getString(R.string.sync_android_master_sync_disabled);
}
@@ -486,7 +486,7 @@ public class AccountManagementFragment extends PreferenceFragment
return res.getString(profileSyncService.getAuthError().getMessage());
}
- if (syncStatusHelper.isSyncEnabled()) {
+ if (androidSyncSettings.isSyncEnabled()) {
if (!profileSyncService.isSyncInitialized()) {
return res.getString(R.string.sync_setup_progress);
}
@@ -504,7 +504,7 @@ public class AccountManagementFragment extends PreferenceFragment
}
}
- return syncStatusHelper.isSyncEnabled(signinController.getSignedInUser())
+ return androidSyncSettings.isSyncEnabled(signinController.getSignedInUser())
? res.getString(R.string.sync_is_enabled)
: res.getString(R.string.sync_is_disabled);
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698