chrome/browser/resources/options/browser_options.js - Issue 944593002: ChromeOS: Update browser option UI for automatic timezone detection.

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 944593002: ChromeOS: Update browser option UI for automatic timezone detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed SharedOptionsTest. 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 | « chrome/browser/resources/options/browser_options.html ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
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 3efebf9f136172657f6e79efd3c41a78e01de7ad..8ba30db451adb4a6e9fa9894aecb30507daa4993 100644

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

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

@@ -407,6 +407,8 @@ cr.define('options', function() {

if (loadTimeData.getBoolean('enableTimeZoneTrackingOption')) {

$('resolve-timezone-by-geolocation-selection').hidden = false;

this.setSystemTimezoneManaged_(false);

+ $('timezone-value-select').disabled = loadTimeData.getBoolean(

+ 'resolveTimezoneByGeolocationInitialValue');

}

@@ -2113,7 +2115,6 @@ cr.define('options', function() {

setCanSetTime_: function(canSetTime) {

// If the time has been network-synced, it cannot be set manually.

- $('time-synced-explanation').hidden = canSetTime;

$('set-time').hidden = !canSetTime;

@@ -2192,6 +2193,7 @@ cr.define('options', function() {

'setMetricsReportingSettingVisibility',

'setProfilesInfo',

'setSpokenFeedbackCheckboxState',

+ 'setSystemTimezoneManaged',

'setThemesResetButtonEnabled',

'setVirtualKeyboardCheckboxState',

'setupPageZoomSelector',