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 <if expr="not pp_ifdef('chromeos')"> | 6 <if expr="not pp_ifdef('chromeos')"> |
7 <include src="sync_section.html"> | 7 <include src="sync_section.html"> |
8 </if> | 8 </if> |
9 <if expr="pp_ifdef('chromeos')"> | 9 <if expr="pp_ifdef('chromeos')"> |
10 <section> | 10 <section> |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
75 <span> | 75 <span> |
76 <label for="show-bookmark-bars" | 76 <label for="show-bookmark-bars" |
77 i18n-content="toolbarShowBookmarksBar"> | 77 i18n-content="toolbarShowBookmarksBar"> |
78 </label> | 78 </label> |
79 <span class="controlled-setting-indicator" | 79 <span class="controlled-setting-indicator" |
80 pref="bookmark_bar.show_on_all_tabs"> | 80 pref="bookmark_bar.show_on_all_tabs"> |
81 </span> | 81 </span> |
82 </span> | 82 </span> |
83 </span> | 83 </span> |
84 </div> | 84 </div> |
85 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> | 85 <if expr="is_posix and not pp_ifdef('chromeos') and not is_macosx"> |
msw
2014/02/06 00:50:27
Will this break GTK, which is shipping for M-24?
Elliot Glaysher
2014/02/06 00:52:30
Theoretically, this shouldn't.
Matt Giuca
2014/02/11 04:57:43
Tested on GTK; it still shows the checkbox. (Not s
msw
2014/02/11 19:32:59
I wasn't sure if we want this on GTK or not. You a
Matt Giuca
2014/02/12 01:09:18
This is already a GTK feature. We aren't trying to
| |
86 <div class="checkbox"><label> | 86 <div class="checkbox"><label> |
87 <input id="show-window-decorations" type="checkbox" | 87 <input id="show-window-decorations" type="checkbox" |
88 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" | 88 pref="browser.custom_chrome_frame" metric="Options_CustomFrame" |
89 inverted_pref> | 89 inverted_pref> |
90 <span i18n-content="showWindowDecorations"></span> | 90 <span i18n-content="showWindowDecorations"></span> |
91 </label></div> | 91 </label></div> |
92 </if> | 92 </if> |
93 </section> | 93 </section> |
94 <if expr="pp_ifdef('chromeos')"> | 94 <if expr="pp_ifdef('chromeos')"> |
95 <section> | 95 <section> |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
883 </div> | 883 </div> |
884 </section> | 884 </section> |
885 </div> <!-- advanced-settings-container --> | 885 </div> <!-- advanced-settings-container --> |
886 </div> <!-- advanced-settings --> | 886 </div> <!-- advanced-settings --> |
887 <footer> | 887 <footer> |
888 <button id="advanced-settings-expander" class="link-button" | 888 <button id="advanced-settings-expander" class="link-button" |
889 i18n-content="showAdvancedSettings"> | 889 i18n-content="showAdvancedSettings"> |
890 </button> | 890 </button> |
891 </footer> | 891 </footer> |
892 </div> | 892 </div> |
OLD | NEW |