Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: chrome/browser/resources/options/browser_options.js

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test and formatted browser_options.html. Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Show that the network settings are shared if this is a secondary user 188 // Show that the network settings are shared if this is a secondary user
189 // in a multi-profile session. 189 // in a multi-profile session.
190 if (loadTimeData.getBoolean('secondaryUser')) { 190 if (loadTimeData.getBoolean('secondaryUser')) {
191 var networkIndicator = document.querySelector( 191 var networkIndicator = document.querySelector(
192 '#network-section-header > .controlled-setting-indicator'); 192 '#network-section-header > .controlled-setting-indicator');
193 networkIndicator.setAttribute('controlled-by', 'shared'); 193 networkIndicator.setAttribute('controlled-by', 'shared');
194 networkIndicator.location = cr.ui.ArrowLocation.TOP_START; 194 networkIndicator.location = cr.ui.ArrowLocation.TOP_START;
195 } 195 }
196 options.network.NetworkList.refreshNetworkData( 196 options.network.NetworkList.refreshNetworkData(
197 loadTimeData.getValue('networkData')); 197 loadTimeData.getValue('networkData'));
198 if (loadTimeData.getBoolean('enableCaptivePortalBypassProxyOption')) {
199 $('captive-portal-bypass-proxy-div').hidden = false;
200 }
198 } 201 }
199 202
200 // On Startup section. 203 // On Startup section.
201 Preferences.getInstance().addEventListener('session.restore_on_startup', 204 Preferences.getInstance().addEventListener('session.restore_on_startup',
202 this.onRestoreOnStartupChanged_.bind(this)); 205 this.onRestoreOnStartupChanged_.bind(this));
203 Preferences.getInstance().addEventListener( 206 Preferences.getInstance().addEventListener(
204 'session.startup_urls', 207 'session.startup_urls',
205 function(event) { 208 function(event) {
206 $('startup-set-pages').disabled = event.value.disabled; 209 $('startup-set-pages').disabled = event.value.disabled;
207 }); 210 });
(...skipping 1990 matching lines...) Expand 10 before | Expand all | Expand 10 after
2198 } 2201 }
2199 button.textContent = loadTimeData.getString(strId); 2202 button.textContent = loadTimeData.getString(strId);
2200 }; 2203 };
2201 } 2204 }
2202 2205
2203 // Export 2206 // Export
2204 return { 2207 return {
2205 BrowserOptions: BrowserOptions 2208 BrowserOptions: BrowserOptions
2206 }; 2209 };
2207 }); 2210 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698