| 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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 $('gpu-mode-checkbox').getAttribute('pref'), | 791 $('gpu-mode-checkbox').getAttribute('pref'), |
| 792 updateGpuRestartButton); | 792 updateGpuRestartButton); |
| 793 $('gpu-mode-reset-restart-button').onclick = function(event) { | 793 $('gpu-mode-reset-restart-button').onclick = function(event) { |
| 794 chrome.send('restartBrowser'); | 794 chrome.send('restartBrowser'); |
| 795 }; | 795 }; |
| 796 updateGpuRestartButton(); | 796 updateGpuRestartButton(); |
| 797 } | 797 } |
| 798 | 798 |
| 799 // Reset profile settings section. | 799 // Reset profile settings section. |
| 800 $('reset-profile-settings').onclick = function(event) { | 800 $('reset-profile-settings').onclick = function(event) { |
| 801 PageManager.showPageByName('resetProfileSettings'); | 801 // We use the hash to indicate the source of the reset request. The hash |
| 802 // is removed by the reset profile settings overlay once it has been |
| 803 // consumed. |
| 804 PageManager.showPageByName('resetProfileSettings', true, |
| 805 {hash: '#userclick'}); |
| 802 }; | 806 }; |
| 803 | 807 |
| 804 // Extension controlled UI. | 808 // Extension controlled UI. |
| 805 this.addExtensionControlledBox_('search-section-content', | 809 this.addExtensionControlledBox_('search-section-content', |
| 806 'search-engine-controlled', | 810 'search-engine-controlled', |
| 807 true); | 811 true); |
| 808 this.addExtensionControlledBox_('extension-controlled-container', | 812 this.addExtensionControlledBox_('extension-controlled-container', |
| 809 'homepage-controlled', | 813 'homepage-controlled', |
| 810 true); | 814 true); |
| 811 this.addExtensionControlledBox_('startup-section-content', | 815 this.addExtensionControlledBox_('startup-section-content', |
| (...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2411 | 2415 |
| 2412 settings.hidden = !isVisible; | 2416 settings.hidden = !isVisible; |
| 2413 }; | 2417 }; |
| 2414 } | 2418 } |
| 2415 | 2419 |
| 2416 // Export | 2420 // Export |
| 2417 return { | 2421 return { |
| 2418 BrowserOptions: BrowserOptions | 2422 BrowserOptions: BrowserOptions |
| 2419 }; | 2423 }; |
| 2420 }); | 2424 }); |
| OLD | NEW |