chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java - Issue 2061803002: 📰 The Status card reports disabled sync states

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2061803002: 📰 The Status card reports disabled sync states (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplifyBridge

Patch Set: yolo: another big bag of changes Created 4 years, 6 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 | « chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

index 3063912d7029fbaef9e190e6d2d7d2e26a644949..09b33fee492a84fb4826356d6021d5ed87f1daa7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SignInPreference.java

@@ -132,17 +132,12 @@ private void update() {

setOnPreferenceClickListener(new OnPreferenceClickListener() {

@Override

public boolean onPreferenceClick(Preference preference) {

- if (ChromeSigninController.get(getContext()).isSignedIn()) return false;

- if (!SigninManager.get(getContext()).isSignInAllowed()) {

- if (SigninManager.get(getContext()).isSigninDisabledByPolicy()) {

- ManagedPreferencesUtils.showManagedByAdministratorToast(getContext());

- }

+ if (!AccountSigninActivity.startIfAllowed(

+ getContext(), SigninAccessPoint.SETTINGS)) {

return false;

}

setEnabled(false);

- AccountSigninActivity.startAccountSigninActivity(

- getContext(), SigninAccessPoint.SETTINGS);

return true;

}

});