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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1014913002: Chromeos: Remove CaptivePortalBypassProxy user option. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 </header> 4 </header>
5 <include src="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <include src="automatic_settings_reset_banner.html"> 6 <include src="automatic_settings_reset_banner.html">
7 <if expr="chromeos"> 7 <if expr="chromeos">
8 <link rel="import" href="chrome://resources/cr_elements/cr_network_icon/cr_net work_icon.html"> 8 <link rel="import" href="chrome://resources/cr_elements/cr_network_icon/cr_net work_icon.html">
9 <link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.htm l"> 9 <link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.htm l">
10 <include src="secondary_user_banner.html"> 10 <include src="secondary_user_banner.html">
11 <section> 11 <section>
12 <div id="network-section-header" class="section-header"> 12 <div id="network-section-header" class="section-header">
13 <h3 i18n-content="sectionTitleInternet"></h3> 13 <h3 i18n-content="sectionTitleInternet"></h3>
14 <span class="controlled-setting-indicator" plural></span> 14 <span class="controlled-setting-indicator" plural></span>
15 </div> 15 </div>
16 <div id="network-settings"> 16 <div id="network-settings">
17 <list id="network-list"></list> 17 <list id="network-list"></list>
18 <div id="shared-proxies" class="checkbox"> 18 <div id="shared-proxies" class="checkbox">
19 <label> 19 <label>
20 <input id="use-shared-proxies" type="checkbox" 20 <input id="use-shared-proxies" type="checkbox"
21 metric="Options_NetworkUseSharedProxies" 21 metric="Options_NetworkUseSharedProxies"
22 pref="settings.use_shared_proxies"> 22 pref="settings.use_shared_proxies">
23 <span i18n-content="useSharedProxies"></span> 23 <span i18n-content="useSharedProxies"></span>
24 </label> 24 </label>
25 </div> 25 </div>
26 <div id="captive-portal-bypass-proxy-div" class="checkbox" hidden>
27 <label>
28 <input id="enable-captive-portal-bypass-proxy"
29 pref="proxy.captive_portal_ignores_proxy"
30 metric="Options_CaptivePortalBypassProxy" type="checkbox">
31 <span i18n-content="captivePortalBypassProxy"></span>
32 </label>
33 </div>
34 <div id="network-menus"></div> 26 <div id="network-menus"></div>
35 </div> 27 </div>
36 </section> 28 </section>
37 </if> 29 </if>
38 <if expr="not chromeos"> 30 <if expr="not chromeos">
39 <include src="sync_section.html"> 31 <include src="sync_section.html">
40 <include src="startup_section.html"> 32 <include src="startup_section.html">
41 </if> 33 </if>
42 <section id="proxy-section" hidden> 34 <section id="proxy-section" hidden>
43 <h3 i18n-content="sectionTitleProxy"></h3> 35 <h3 i18n-content="sectionTitleProxy"></h3>
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 </button> 1023 </button>
1032 </div> 1024 </div>
1033 </section> 1025 </section>
1034 </div> <!-- advanced-settings-container --> 1026 </div> <!-- advanced-settings-container -->
1035 </div> <!-- advanced-settings --> 1027 </div> <!-- advanced-settings -->
1036 <footer id="advanced-settings-footer"> 1028 <footer id="advanced-settings-footer">
1037 <a is="action-link" id="advanced-settings-expander" 1029 <a is="action-link" id="advanced-settings-expander"
1038 i18n-content="showAdvancedSettings"></a> 1030 i18n-content="showAdvancedSettings"></a>
1039 </footer> 1031 </footer>
1040 </div> 1032 </div>
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/options/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698