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

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: Resolve conflicts with ToT 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/device_page/device_page.html » ('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/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="/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">
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 </settings-checkbox> 104 </settings-checkbox>
105 </div> 105 </div>
106 <div class="settings-box"> 106 <div class="settings-box">
107 </if> 107 </if>
108 <div class="start">$i18n{fontSize}</div> 108 <div class="start">$i18n{fontSize}</div>
109 <settings-dropdown-menu id="defaultFontSize" 109 <settings-dropdown-menu id="defaultFontSize"
110 pref="{{prefs.webkit.webprefs.default_font_size}}" 110 pref="{{prefs.webkit.webprefs.default_font_size}}"
111 menu-options="[[fontSizeOptions_]]" no-label-float> 111 menu-options="[[fontSizeOptions_]]" no-label-float>
112 </settings-dropdown-menu> 112 </settings-dropdown-menu>
113 </div> 113 </div>
114 <div class="settings-box two-line single-column" 114 <div id="customize-fonts-subpage-trigger"
115 class="settings-box two-line single-column"
115 on-tap="onCustomizeFontsTap_" actionable> 116 on-tap="onCustomizeFontsTap_" actionable>
116 <div>$i18n{customizeFonts}</div> 117 <div>$i18n{customizeFonts}</div>
117 <div class="secondary">$i18n{chooseFontsAndEncoding}</div> 118 <div class="secondary">$i18n{chooseFontsAndEncoding}</div>
118 </div> 119 </div>
119 <div class="settings-box" 120 <div class="settings-box"
120 hidden="[[!pageVisibility.pageZoom]]"> 121 hidden="[[!pageVisibility.pageZoom]]">
121 <div class="start">$i18n{pageZoom}</div> 122 <div class="start">$i18n{pageZoom}</div>
122 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}" 123 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}"
123 menu-options="[[pageZoomOptions_]]" no-label-float> 124 menu-options="[[pageZoomOptions_]]" no-label-float>
124 </settings-dropdown-menu> 125 </settings-dropdown-menu>
125 </div> 126 </div>
126 </neon-animatable> 127 </neon-animatable>
127 <template is="dom-if" name="appearance-fonts"> 128 <template is="dom-if" name="appearance-fonts">
128 <settings-subpage page-title="$i18n{customizeFonts}"> 129 <settings-subpage
130 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
131 page-title="$i18n{customizeFonts}">
129 <settings-appearance-fonts-page prefs="{{prefs}}"> 132 <settings-appearance-fonts-page prefs="{{prefs}}">
130 </settings-appearance-fonts-page> 133 </settings-appearance-fonts-page>
131 </settings-subpage> 134 </settings-subpage>
132 </template> 135 </template>
133 </settings-animated-pages> 136 </settings-animated-pages>
134 </template> 137 </template>
135 <script src="appearance_page.js"></script> 138 <script src="appearance_page.js"></script>
136 </dom-module> 139 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/device_page/device_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698