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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Issue 2399183002: Do not allow sign in if Google play service is absent (Closed)
Patch Set: fix presubmit Created 4 years, 2 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/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index 318d2675f9cf9ab65725af90d7ec38b28ed40213..32dfda7d5cbbfbdb76d0f45fc6d79cb216201dd0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -76,17 +76,16 @@ public class MainPreferences extends PreferenceFragment
// the SignInPreference.
updatePreferences();
- if (!mIsDemoUser) {
+ if (isUserAllowedToSignIn()) {
SigninManager.get(getActivity()).addSignInStateObserver(this);
setupSignInPref();
}
-
}
@Override
public void onPause() {
super.onPause();
- if (!mIsDemoUser) {
+ if (isUserAllowedToSignIn()) {
SigninManager.get(getActivity()).removeSignInStateObserver(this);
clearSignInPref();
}
@@ -169,7 +168,7 @@ public class MainPreferences extends PreferenceFragment
getPreferenceScreen().removePreference(dataReduction);
}
- if (mIsDemoUser) {
+ if (!isUserAllowedToSignIn()) {
getPreferenceScreen().removePreference(findPreference(PREF_SIGN_IN));
}
}
@@ -225,6 +224,11 @@ public class MainPreferences extends PreferenceFragment
updatePreferences();
}
+ private boolean isUserAllowedToSignIn() {
+ boolean allowSignIn = SigninManager.get(getActivity()).isSignInAllowed();
+ return allowSignIn && !mIsDemoUser;
+ }
+
private ManagedPreferenceDelegate createManagedPreferenceDelegate() {
return new ManagedPreferenceDelegate() {
@Override

Powered by Google App Engine
This is Rietveld 408576698