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

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

Issue 879533004: Rewrite AndroidSyncSettings to be significantly simpler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@android-sync
Patch Set: Address comments and fix AccountManagementFragment. 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/java/src/org/chromium/chrome/browser/signin/SigninManager.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 82de70c477f0926c520bf5277f0a5550d91f16bb..2c1399da15d135ef3bc7ef957724d49c9f74eb91 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
@@ -467,8 +467,7 @@ public class AccountManagementFragment extends PreferenceFragment
}
private static String getSyncStatusSummary(Activity activity) {
- ChromeSigninController signinController = ChromeSigninController.get(activity);
- if (!signinController.isSignedIn()) return "";
+ if (!ChromeSigninController.get(activity).isSignedIn()) return "";
AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(activity);
ProfileSyncService profileSyncService = ProfileSyncService.get(activity);
@@ -504,7 +503,7 @@ public class AccountManagementFragment extends PreferenceFragment
}
}
- return androidSyncSettings.isSyncEnabled(signinController.getSignedInUser())
+ return androidSyncSettings.isSyncEnabled()
? 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/signin/SigninManager.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698