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

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

Issue 1138013008: [Sync] Make it impossible to get a reference to AndroidSyncSettings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address nit. Created 5 years, 7 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/sync/ui/SyncCustomizationFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
index 5e1450f6b68a37e89241f1712772e2cba174c2df..9b3c7260598e263807d08e8084f90da332af89be 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java
@@ -89,7 +89,6 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
private static final int ERROR_COLOR = Color.RED;
private ChromeSwitchPreference mSyncSwitchPreference;
- private AndroidSyncSettings mAndroidSyncSettings;
private boolean mIsSyncInitialized;
@VisibleForTesting
@@ -120,7 +119,6 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- mAndroidSyncSettings = AndroidSyncSettings.get(getActivity());
mProfileSyncService = ProfileSyncService.get(getActivity());
mIsSyncInitialized = mProfileSyncService.isSyncInitialized();
@@ -242,7 +240,8 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
if (!getActivity().isChangingConfigurations()) {
// Only save state if the switch and external state match. If a stop and clear comes
// while the dialog is open, this will be false and settings won't be saved.
- if (mSyncSwitchPreference.isChecked() && mAndroidSyncSettings.isSyncEnabled()) {
+ if (mSyncSwitchPreference.isChecked()
+ && AndroidSyncSettings.isSyncEnabled(getActivity())) {
// Save the new data type state.
configureSyncDataTypes();
// Inform sync that the user has finished setting up sync at least once.
@@ -260,7 +259,7 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
* updateSyncStateFromSwitch, which uses that as its source of truth.
*/
private void updateSyncState() {
- boolean isSyncEnabled = mAndroidSyncSettings.isSyncEnabled();
+ boolean isSyncEnabled = AndroidSyncSettings.isSyncEnabled(getActivity());
mSyncSwitchPreference.setChecked(isSyncEnabled);
mSyncSwitchPreference.setEnabled(canDisableSync());
updateSyncStateFromSwitch();

Powered by Google App Engine
This is Rietveld 408576698