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="not pp_ifdef('chromeos')"> | |
8 <include src="sync_section.html"> | |
9 </if> | |
10 <if expr="pp_ifdef('chromeos')"> | 7 <if expr="pp_ifdef('chromeos')"> |
| 8 <include src="secondary_user_banner.html"> |
11 <section> | 9 <section> |
12 <h3 i18n-content="sectionTitleInternet"></h3> | 10 <div id="network-section-header" class="section-header"> |
| 11 <h3 i18n-content="sectionTitleInternet"></h3> |
| 12 <span class="controlled-setting-indicator" plural></span> |
| 13 </div> |
13 <div id="network-settings"> | 14 <div id="network-settings"> |
14 <list id="network-list"></list> | 15 <list id="network-list"></list> |
15 <div id="shared-proxies" class="checkbox"> | 16 <div id="shared-proxies" class="checkbox"> |
16 <label> | 17 <label> |
17 <input id="use-shared-proxies" type="checkbox" | 18 <input id="use-shared-proxies" type="checkbox" |
18 pref="settings.use_shared_proxies"> | 19 pref="settings.use_shared_proxies"> |
19 <span i18n-content="useSharedProxies"></span> | 20 <span i18n-content="useSharedProxies"></span> |
20 </label> | 21 </label> |
21 </div> | 22 </div> |
22 <div id="network-menus"></div> | 23 <div id="network-menus"></div> |
23 </div> | 24 </div> |
24 </section> | 25 </section> |
25 </if> | 26 </if> |
26 <if expr="not pp_ifdef('chromeos')"> | 27 <if expr="not pp_ifdef('chromeos')"> |
| 28 <include src="sync_section.html"> |
27 <include src="startup_section.html"> | 29 <include src="startup_section.html"> |
28 </if> | 30 </if> |
29 <section> | 31 <section> |
30 <h3 i18n-content="sectionTitleAppearance"></h3> | 32 <h3 i18n-content="sectionTitleAppearance"></h3> |
31 <div class="settings-row"> | 33 <div class="settings-row"> |
32 <if expr="pp_ifdef('chromeos')"> | 34 <if expr="pp_ifdef('chromeos')"> |
33 <button id="set-wallpaper" i18n-content="setWallpaper" | 35 <button id="set-wallpaper" i18n-content="setWallpaper" |
34 guest-visibility="disabled"></button> | 36 guest-visibility="disabled"></button> |
35 </if> | 37 </if> |
36 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx"> | 38 <if expr="not pp_ifdef('chromeos') and is_posix and not is_macosx"> |
(...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 </div> | 892 </div> |
891 </section> | 893 </section> |
892 </div> <!-- advanced-settings-container --> | 894 </div> <!-- advanced-settings-container --> |
893 </div> <!-- advanced-settings --> | 895 </div> <!-- advanced-settings --> |
894 <footer> | 896 <footer> |
895 <button id="advanced-settings-expander" class="link-button" | 897 <button id="advanced-settings-expander" class="link-button" |
896 i18n-content="showAdvancedSettings"> | 898 i18n-content="showAdvancedSettings"> |
897 </button> | 899 </button> |
898 </footer> | 900 </footer> |
899 </div> | 901 </div> |
OLD | NEW |