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

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

Issue 2210583002: MD Settings: Associate suppages with the controls that trigger them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing comments. Created 4 years, 4 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/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/iron-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
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-radio-button/pape r-radio-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.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/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">
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 </settings-checkbox> 99 </settings-checkbox>
100 </div> 100 </div>
101 <div class="settings-box"> 101 <div class="settings-box">
102 </if> 102 </if>
103 <div class="start">$i18n{fontSize}</div> 103 <div class="start">$i18n{fontSize}</div>
104 <settings-dropdown-menu id="defaultFontSize" 104 <settings-dropdown-menu id="defaultFontSize"
105 pref="{{prefs.webkit.webprefs.default_font_size}}" 105 pref="{{prefs.webkit.webprefs.default_font_size}}"
106 menu-options="[[fontSizeOptions_]]" no-label-float> 106 menu-options="[[fontSizeOptions_]]" no-label-float>
107 </settings-dropdown-menu> 107 </settings-dropdown-menu>
108 </div> 108 </div>
109 <div class="settings-box two-line single-column" 109 <div id="customize-fonts-subpage-trigger"
110 class="settings-box two-line single-column"
110 on-tap="onCustomizeFontsTap_" actionable> 111 on-tap="onCustomizeFontsTap_" actionable>
111 <div>$i18n{customizeFonts}</div> 112 <div>$i18n{customizeFonts}</div>
112 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> 113 <div class="secondary">$i18n{chooseFontsAndEncoding}</div>
113 </div> 114 </div>
114 <div class="settings-box" 115 <div class="settings-box"
115 hidden="[[!pageVisibility.pageZoom]]"> 116 hidden="[[!pageVisibility.pageZoom]]">
116 <div class="start">$i18n{pageZoom}</div> 117 <div class="start">$i18n{pageZoom}</div>
117 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" 118 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}"
118 menu-options="[[pageZoomOptions_]]" no-label-float> 119 menu-options="[[pageZoomOptions_]]" no-label-float>
119 </settings-dropdown-menu> 120 </settings-dropdown-menu>
120 </div> 121 </div>
121 </neon-animatable> 122 </neon-animatable>
122 <template is="dom-if" name="appearance-fonts"> 123 <template is="dom-if" name="appearance-fonts">
123 <settings-subpage page-title="$i18n{customizeFonts}"> 124 <settings-subpage
125 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
126 page-title="$i18n{customizeFonts}">
124 <settings-appearance-fonts-page prefs="{{prefs}}"> 127 <settings-appearance-fonts-page prefs="{{prefs}}">
125 </settings-appearance-fonts-page> 128 </settings-appearance-fonts-page>
126 </settings-subpage> 129 </settings-subpage>
127 </template> 130 </template>
128 </settings-animated-pages> 131 </settings-animated-pages>
129 </template> 132 </template>
130 <script src="appearance_page.js"></script> 133 <script src="appearance_page.js"></script>
131 </dom-module> 134 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698