chrome/browser/resources/options/browser_options.html - Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy.

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

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests fixed. 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

OLD	NEW
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 <include src="secondary_user_banner.html">	8 <include src="secondary_user_banner.html">

9 <section>	9 <section>

10 <div id="network-section-header" class="section-header">	10 <div id="network-section-header" class="section-header">

11 <h3 i18n-content="sectionTitleInternet"></h3>	11 <h3 i18n-content="sectionTitleInternet"></h3>

12 <span class="controlled-setting-indicator" plural></span>	12 <span class="controlled-setting-indicator" plural></span>

13 </div>	13 </div>

14 <div id="network-settings">	14 <div id="network-settings">

15 <list id="network-list"></list>	15 <list id="network-list"></list>

16 <div id="shared-proxies" class="checkbox">	16 <div id="shared-proxies" class="checkbox">

17 <label>	17 <label>

18 <input id="use-shared-proxies" type="checkbox"	18 <input id="use-shared-proxies" type="checkbox"

19 metric="Options_NetworkUseSharedProxies"	19 metric="Options_NetworkUseSharedProxies"

20 pref="settings.use_shared_proxies">	20 pref="settings.use_shared_proxies">

21 <span i18n-content="useSharedProxies"></span>	21 <span i18n-content="useSharedProxies"></span>

22 </label>	22 </label>

23 </div>	23 </div>

	24 <div id="captive-portal-bypass-proxy-div" class="checkbox" hidden>

	25 <label>

	26 <input id="enable-captive-portal-bypass-proxy"

	27 pref="proxy.captive_portal_ignores_proxy"

	28 metric="Options_CaptivePortalBypassProxy" type="checkbox">

	29 <span i18n-content="captivePortalBypassProxy"></span>

	30 </label>

	31 </div>

24 <div id="network-menus"></div>	32 <div id="network-menus"></div>

25 </div>	33 </div>

26 </section>	34 </section>

27 </if>	35 </if>

28 <if expr="not chromeos">	36 <if expr="not chromeos">

29 <include src="sync_section.html">	37 <include src="sync_section.html">

30 <include src="startup_section.html">	38 <include src="startup_section.html">

31 </if>	39 </if>

32 <section id="proxy-section" hidden>	40 <section id="proxy-section" hidden>

33 <h3 i18n-content="sectionTitleProxy"></h3>	41 <h3 i18n-content="sectionTitleProxy"></h3>

(...skipping 987 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1021 </button>	1029 </button>

1022 </div>	1030 </div>

1023 </section>	1031 </section>

1024 </div> <!-- advanced-settings-container -->	1032 </div> <!-- advanced-settings-container -->

1025 </div> <!-- advanced-settings -->	1033 </div> <!-- advanced-settings -->

1026 <footer id="advanced-settings-footer">	1034 <footer id="advanced-settings-footer">

1027 <a is="action-link" id="advanced-settings-expander"	1035 <a is="action-link" id="advanced-settings-expander"

1028 i18n-content="showAdvancedSettings"></a>	1036 i18n-content="showAdvancedSettings"></a>

1029 </footer>	1037 </footer>

1030 </div>	1038 </div>

OLD	NEW