| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 cr.exportPath('options'); | 5 cr.exportPath('options'); |
| 6 | 6 |
| 7 /** | 7 /** |
| 8 * @typedef {{actionLinkText: (string|undefined), | 8 * @typedef {{actionLinkText: (string|undefined), |
| 9 * childUser: (boolean|undefined), | 9 * childUser: (boolean|undefined), |
| 10 * hasError: (boolean|undefined), | 10 * hasError: (boolean|undefined), |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 794 $('gpu-mode-checkbox').getAttribute('pref'), | 794 $('gpu-mode-checkbox').getAttribute('pref'), |
| 795 updateGpuRestartButton); | 795 updateGpuRestartButton); |
| 796 $('gpu-mode-reset-restart-button').onclick = function(event) { | 796 $('gpu-mode-reset-restart-button').onclick = function(event) { |
| 797 chrome.send('restartBrowser'); | 797 chrome.send('restartBrowser'); |
| 798 }; | 798 }; |
| 799 updateGpuRestartButton(); | 799 updateGpuRestartButton(); |
| 800 } | 800 } |
| 801 | 801 |
| 802 // Reset profile settings section. | 802 // Reset profile settings section. |
| 803 $('reset-profile-settings').onclick = function(event) { | 803 $('reset-profile-settings').onclick = function(event) { |
| 804 PageManager.showPageByName('resetProfileSettings'); | 804 // We use the hash to indicate the source of the reset request. The hash |
| 805 // is removed by the reset profile settings overlay once it has been |
| 806 // consumed. |
| 807 PageManager.showPageByName('resetProfileSettings', true, |
| 808 {hash: '#userClick'}); |
| 805 }; | 809 }; |
| 806 | 810 |
| 807 // Extension controlled UI. | 811 // Extension controlled UI. |
| 808 this.addExtensionControlledBox_('search-section-content', | 812 this.addExtensionControlledBox_('search-section-content', |
| 809 'search-engine-controlled', | 813 'search-engine-controlled', |
| 810 true); | 814 true); |
| 811 this.addExtensionControlledBox_('extension-controlled-container', | 815 this.addExtensionControlledBox_('extension-controlled-container', |
| 812 'homepage-controlled', | 816 'homepage-controlled', |
| 813 true); | 817 true); |
| 814 this.addExtensionControlledBox_('startup-section-content', | 818 this.addExtensionControlledBox_('startup-section-content', |
| (...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2451 | 2455 |
| 2452 settings.hidden = !isVisible; | 2456 settings.hidden = !isVisible; |
| 2453 }; | 2457 }; |
| 2454 } | 2458 } |
| 2455 | 2459 |
| 2456 // Export | 2460 // Export |
| 2457 return { | 2461 return { |
| 2458 BrowserOptions: BrowserOptions | 2462 BrowserOptions: BrowserOptions |
| 2459 }; | 2463 }; |
| 2460 }); | 2464 }); |
| OLD | NEW |