chrome/browser/resources/options/browser_options.js - Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939

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/browser/resources/options/browser_options.js

Issue 225523004: Updates the UI and reenables the fix introduced in commit 256939 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixes a problem related to browser tests and rebased to latest source Created 6 years, 8 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/app/google_chrome_strings.grd ('k') | chrome/browser/resources/options/manage_profile_overlay.css » ('j') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options/browser_options.js

diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js

index c057e664676b66ad2ec28ab6b45d3225f547c714..eb49c37dd9b122df49c1a6d7bf19f4be5781cbc8 100644

--- a/chrome/browser/resources/options/browser_options.js

+++ b/chrome/browser/resources/options/browser_options.js

@@ -868,8 +868,7 @@ cr.define('options', function() {

// Disable the "sign in" button if we're currently signing in, or if we're

// already signed in and signout is not allowed.

var signInButton = $('start-stop-sync');

- signInButton.disabled = syncData.setupInProgress ||

- !syncData.signoutAllowed;

+ signInButton.disabled = syncData.setupInProgress;

this.signoutAllowed_ = syncData.signoutAllowed;

if (!syncData.signoutAllowed)

$('start-stop-sync-indicator').setAttribute('controlled-by', 'policy');