Chromium Code Reviews| Index: chrome/browser/resources/options2/browser_options.js |
| diff --git a/chrome/browser/resources/options2/browser_options.js b/chrome/browser/resources/options2/browser_options.js |
| index f8a0b2b6b03fc55f3ac9fd3379526e9009a32335..fcc581cd0230ec98d658790fad1d0a97ea1972d7 100644 |
| --- a/chrome/browser/resources/options2/browser_options.js |
| +++ b/chrome/browser/resources/options2/browser_options.js |
| @@ -482,6 +482,15 @@ cr.define('options', function() { |
| }; |
| } |
| + // Display management section (CrOS only). |
| + if (cr.isChromeOS) { |
| + $('displayOptionsButton').onclick = function(event) { |
| + OptionsPage.navigateToPage('display'); |
| + chrome.send('coreOptionsUserMetricsAction', |
| + ['Options_Display']); |
| + } |
| + } |
| + |
| // Background mode section. |
| if ($('backgroundModeCheckbox')) { |
| cr.defineProperty($('backgroundModeCheckbox'), |
| @@ -1258,6 +1267,22 @@ cr.define('options', function() { |
| }, |
| /** |
| + * Activate the display options button on the System settings page. |
| + * @private |
| + */ |
| + showDisplayOptions_: function() { |
| + $('display-options-section').hidden = false; |
|
James Hawkins
2012/06/18 15:13:49
Please copy showTouchpadControls_ here instead of
Jun Mukai
2012/06/19 08:37:44
Done.
|
| + }, |
| + |
| + /** |
| + * Deactivate the display options button on the System settings page. |
| + * @private |
| + */ |
| + hideDisplayOptions_: function() { |
| + $('display-options-section').hidden = true; |
| + }, |
| + |
| + /** |
| * Activate the bluetooth settings section on the System settings page. |
| * @private |
| */ |
| @@ -1357,6 +1382,7 @@ cr.define('options', function() { |
| 'addBluetoothDevice', |
| 'getStartStopSyncButton', |
| 'hideBluetoothSettings', |
| + 'hideDisplayOptions', |
| 'removeCloudPrintConnectorSection', |
| 'removeBluetoothDevice', |
| 'setAutoOpenFileTypesDisplayed', |
| @@ -1379,6 +1405,7 @@ cr.define('options', function() { |
| 'setupProxySettingsSection', |
| 'setVirtualKeyboardCheckboxState', |
| 'showBluetoothSettings', |
| + 'showDisplayOptions', |
| 'showMouseControls', |
| 'showTouchpadControls', |
| 'updateAccountPicture', |