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

Side by Side Diff: chrome/browser/resources/settings/appearance_page/appearance_page.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 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 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> 8 <link rel="import" href="/appearance_page/appearance_browser_proxy.html">
9 <link rel="import" href="/controls/controlled_radio_button.html"> 9 <link rel="import" href="/controls/controlled_radio_button.html">
10 <link rel="import" href="/controls/extension_controlled_indicator.html"> 10 <link rel="import" href="/controls/extension_controlled_indicator.html">
11 <link rel="import" href="/controls/settings_dropdown_menu.html"> 11 <link rel="import" href="/controls/settings_dropdown_menu.html">
12 <link rel="import" href="/controls/settings_input.html"> 12 <link rel="import" href="/controls/settings_input.html">
13 <link rel="import" href="/controls/settings_radio_group.html"> 13 <link rel="import" href="/controls/settings_radio_group.html">
14 <link rel="import" href="/controls/settings_toggle_button.html">
14 <link rel="import" href="/route.html"> 15 <link rel="import" href="/route.html">
15 <link rel="import" href="/settings_page/settings_animated_pages.html"> 16 <link rel="import" href="/settings_page/settings_animated_pages.html">
16 <link rel="import" href="/settings_page/settings_subpage.html"> 17 <link rel="import" href="/settings_page/settings_subpage.html">
17 <link rel="import" href="/settings_shared_css.html"> 18 <link rel="import" href="/settings_shared_css.html">
18 <link rel="import" href="/settings_vars_css.html"> 19 <link rel="import" href="/settings_vars_css.html">
19 <link rel="import" href="appearance_fonts_page.html"> 20 <link rel="import" href="appearance_fonts_page.html">
20 21
21 <dom-module id="settings-appearance-page"> 22 <dom-module id="settings-appearance-page">
22 <template> 23 <template>
23 <style include="settings-shared md-select"> 24 <style include="settings-shared md-select">
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 <paper-button id="useSystem" on-tap="onUseSystemTap_" 84 <paper-button id="useSystem" on-tap="onUseSystemTap_"
84 class="secondary-button"> 85 class="secondary-button">
85 $i18n{useSystemTheme} 86 $i18n{useSystemTheme}
86 </paper-button> 87 </paper-button>
87 </template> 88 </template>
88 </div> 89 </div>
89 </if> 90 </if>
90 </div> 91 </div>
91 <div class="settings-box" 92 <div class="settings-box"
92 hidden="[[!pageVisibility.homeButton]]"> 93 hidden="[[!pageVisibility.homeButton]]">
93 <settings-checkbox class="start" label="$i18n{showHomeButton}" 94 <settings-toggle-button class="start"
95 pref="{{prefs.browser.show_home_button}}"
96 label="$i18n{showHomeButton}"
94 sub-label="[[getShowHomeSubLabel_( 97 sub-label="[[getShowHomeSubLabel_(
95 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]" 98 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]">
96 pref="{{prefs.browser.show_home_button}}"> 99 </settings-toggle-button>
97 </settings-checkbox>
98 </div> 100 </div>
99 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 101 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
100 <div class="list-frame" 102 <div class="list-frame"
101 hidden="[[!pageVisibility.homeButton]]"> 103 hidden="[[!pageVisibility.homeButton]]">
102 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> 104 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
103 <controlled-radio-button class="list-item" name="true" 105 <controlled-radio-button class="list-item" name="true"
104 pref="[[prefs.homepage_is_newtabpage]]"> 106 pref="[[prefs.homepage_is_newtabpage]]">
105 $i18n{homePageNtp} 107 $i18n{homePageNtp}
106 </controlled-radio-button> 108 </controlled-radio-button>
107 <controlled-radio-button class="list-item" name="false" 109 <controlled-radio-button class="list-item" name="false"
(...skipping 15 matching lines...) Expand all
123 prefs.homepage.extensionCanBeDisabled]]" 125 prefs.homepage.extensionCanBeDisabled]]"
124 extension-name="[[prefs.homepage.controlledByName]]" 126 extension-name="[[prefs.homepage.controlledByName]]"
125 on-disable-extension="onDisableExtension_"> 127 on-disable-extension="onDisableExtension_">
126 </extension-controlled-indicator> 128 </extension-controlled-indicator>
127 </template> 129 </template>
128 </settings-radio-group> 130 </settings-radio-group>
129 </div> 131 </div>
130 </template> 132 </template>
131 <div class="settings-box" 133 <div class="settings-box"
132 hidden="[[!pageVisibility.bookmarksBar]]"> 134 hidden="[[!pageVisibility.bookmarksBar]]">
133 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" 135 <settings-toggle-button class="start"
134 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 136 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
135 </settings-checkbox> 137 label="$i18n{showBookmarksBar}">
138 </settings-toggle-button>
136 </div> 139 </div>
137 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> 140 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]">
138 <if expr="is_linux and not chromeos"> 141 <if expr="is_linux and not chromeos">
139 <settings-checkbox class="start" label="$i18n{showWindowDecorations}" 142 <settings-toggle-button class="start"
140 pref="{{prefs.browser.custom_chrome_frame}}" inverted> 143 pref="{{prefs.browser.custom_chrome_frame}}"
141 </settings-checkbox> 144 label="$i18n{showWindowDecorations}"
145 inverted>
146 </settings-toggle-button>
142 </div> 147 </div>
143 <div class="settings-box"> 148 <div class="settings-box">
144 </if> 149 </if>
145 <div class="start">$i18n{fontSize}</div> 150 <div class="start">$i18n{fontSize}</div>
146 <settings-dropdown-menu id="defaultFontSize" 151 <settings-dropdown-menu id="defaultFontSize"
147 pref="{{prefs.webkit.webprefs.default_font_size}}" 152 pref="{{prefs.webkit.webprefs.default_font_size}}"
148 menu-options="[[fontSizeOptions_]]"> 153 menu-options="[[fontSizeOptions_]]">
149 </settings-dropdown-menu> 154 </settings-dropdown-menu>
150 </div> 155 </div>
151 <div id="customize-fonts-subpage-trigger" class="settings-box two-line" 156 <div id="customize-fonts-subpage-trigger" class="settings-box two-line"
(...skipping 26 matching lines...) Expand all
178 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 183 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
179 page-title="$i18n{customizeFonts}"> 184 page-title="$i18n{customizeFonts}">
180 <settings-appearance-fonts-page prefs="{{prefs}}"> 185 <settings-appearance-fonts-page prefs="{{prefs}}">
181 </settings-appearance-fonts-page> 186 </settings-appearance-fonts-page>
182 </settings-subpage> 187 </settings-subpage>
183 </template> 188 </template>
184 </settings-animated-pages> 189 </settings-animated-pages>
185 </template> 190 </template>
186 <script src="appearance_page.js"></script> 191 <script src="appearance_page.js"></script>
187 </dom-module> 192 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698