| 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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 // Show that the network settings are shared if this is a secondary user | 199 // Show that the network settings are shared if this is a secondary user |
| 200 // in a multi-profile session. | 200 // in a multi-profile session. |
| 201 if (loadTimeData.getBoolean('secondaryUser')) { | 201 if (loadTimeData.getBoolean('secondaryUser')) { |
| 202 var networkIndicator = document.querySelector( | 202 var networkIndicator = document.querySelector( |
| 203 '#network-section-header > .controlled-setting-indicator'); | 203 '#network-section-header > .controlled-setting-indicator'); |
| 204 networkIndicator.setAttribute('controlled-by', 'shared'); | 204 networkIndicator.setAttribute('controlled-by', 'shared'); |
| 205 networkIndicator.location = cr.ui.ArrowLocation.TOP_START; | 205 networkIndicator.location = cr.ui.ArrowLocation.TOP_START; |
| 206 } | 206 } |
| 207 options.network.NetworkList.refreshNetworkData( | 207 options.network.NetworkList.refreshNetworkData( |
| 208 loadTimeData.getValue('networkData')); | 208 loadTimeData.getValue('networkData')); |
| 209 if (loadTimeData.getBoolean('enableCaptivePortalBypassProxyOption')) { |
| 210 $('captive-portal-bypass-proxy-div').hidden = false; |
| 211 } |
| 209 } | 212 } |
| 210 | 213 |
| 211 // On Startup section. | 214 // On Startup section. |
| 212 Preferences.getInstance().addEventListener('session.restore_on_startup', | 215 Preferences.getInstance().addEventListener('session.restore_on_startup', |
| 213 this.onRestoreOnStartupChanged_.bind(this)); | 216 this.onRestoreOnStartupChanged_.bind(this)); |
| 214 Preferences.getInstance().addEventListener( | 217 Preferences.getInstance().addEventListener( |
| 215 'session.startup_urls', | 218 'session.startup_urls', |
| 216 function(event) { | 219 function(event) { |
| 217 $('startup-set-pages').disabled = event.value.disabled; | 220 $('startup-set-pages').disabled = event.value.disabled; |
| 218 }); | 221 }); |
| (...skipping 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 } | 2269 } |
| 2267 button.textContent = loadTimeData.getString(strId); | 2270 button.textContent = loadTimeData.getString(strId); |
| 2268 }; | 2271 }; |
| 2269 } | 2272 } |
| 2270 | 2273 |
| 2271 // Export | 2274 // Export |
| 2272 return { | 2275 return { |
| 2273 BrowserOptions: BrowserOptions | 2276 BrowserOptions: BrowserOptions |
| 2274 }; | 2277 }; |
| 2275 }); | 2278 }); |
| OLD | NEW |