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

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

Issue 2403353002: MD Settings: Stop calling chrome.settingsPrivate.setDefaultZoomLevel on startup. (Closed)
Patch Set: More Created 4 years, 2 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 | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.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 <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/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 3 <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/neon-animation/neon-ani matable.html"> 4 <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/paper-button/paper-butt on.html"> 5 <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-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="/appearance_page/appearance_browser_proxy.html"> 7 <link rel="import" href="/appearance_page/appearance_browser_proxy.html">
8 <link rel="import" href="/controls/controlled_radio_button.html"> 8 <link rel="import" href="/controls/controlled_radio_button.html">
9 <link rel="import" href="/controls/settings_dropdown_menu.html"> 9 <link rel="import" href="/controls/settings_dropdown_menu.html">
10 <link rel="import" href="/controls/settings_input.html"> 10 <link rel="import" href="/controls/settings_input.html">
11 <link rel="import" href="/controls/settings_radio_group.html"> 11 <link rel="import" href="/controls/settings_radio_group.html">
12 <link rel="import" href="/md_select_css.html">
12 <link rel="import" href="/route.html"> 13 <link rel="import" href="/route.html">
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> 14 <link rel="import" href="/settings_page/settings_animated_pages.html">
14 <link rel="import" href="/settings_page/settings_subpage.html"> 15 <link rel="import" href="/settings_page/settings_subpage.html">
15 <link rel="import" href="/settings_shared_css.html"> 16 <link rel="import" href="/settings_shared_css.html">
16 <link rel="import" href="appearance_fonts_page.html"> 17 <link rel="import" href="appearance_fonts_page.html">
17 18
18 <dom-module id="settings-appearance-page"> 19 <dom-module id="settings-appearance-page">
19 <template> 20 <template>
20 <style include="settings-shared"> 21 <style include="settings-shared md-select">
21 :host { 22 :host {
22 --paper-input-container-label: { 23 --paper-input-container-label: {
23 font-size: inherit; 24 font-size: inherit;
24 font-weight: inherit; 25 font-weight: inherit;
25 }; 26 };
26 } 27 }
27 28
28 .secondary-button ~ .secondary-button { 29 .secondary-button ~ .secondary-button {
29 -webkit-margin-start: 12px; 30 -webkit-margin-start: 12px;
30 } 31 }
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <div class="start"> 140 <div class="start">
140 <div>$i18n{customizeFonts}</div> 141 <div>$i18n{customizeFonts}</div>
141 <div class="secondary">$i18n{chooseFonts}</div> 142 <div class="secondary">$i18n{chooseFonts}</div>
142 </div> 143 </div>
143 <button class="icon-arrow-right" is="paper-icon-button-light"> 144 <button class="icon-arrow-right" is="paper-icon-button-light">
144 </button> 145 </button>
145 </div> 146 </div>
146 <div class="settings-box" 147 <div class="settings-box"
147 hidden="[[!pageVisibility.pageZoom]]"> 148 hidden="[[!pageVisibility.pageZoom]]">
148 <div class="start">$i18n{pageZoom}</div> 149 <div class="start">$i18n{pageZoom}</div>
149 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" 150 <div class="md-select-wrapper">
150 menu-options="[[pageZoomOptions_]]"> 151 <select id="zoomLevel" class="md-select"
151 </settings-dropdown-menu> 152 on-change="onZoomLevelChange_">
153 <template is="dom-repeat" items="[[pageZoomOptions_]]">
154 <option value="[[item.value]]">[[item.name]]</option>
155 </template>
156 </select>
157 <span class="md-select-underline"></span>
158 </div>
152 </div> 159 </div>
153 </neon-animatable> 160 </neon-animatable>
154 <template is="dom-if" route-path="/fonts"> 161 <template is="dom-if" route-path="/fonts">
155 <settings-subpage 162 <settings-subpage
156 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 163 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
157 page-title="$i18n{customizeFonts}"> 164 page-title="$i18n{customizeFonts}">
158 <settings-appearance-fonts-page prefs="{{prefs}}"> 165 <settings-appearance-fonts-page prefs="{{prefs}}">
159 </settings-appearance-fonts-page> 166 </settings-appearance-fonts-page>
160 </settings-subpage> 167 </settings-subpage>
161 </template> 168 </template>
162 </settings-animated-pages> 169 </settings-animated-pages>
163 </template> 170 </template>
164 <script src="appearance_page.js"></script> 171 <script src="appearance_page.js"></script>
165 </dom-module> 172 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698