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

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

Issue 1420533011: [MD settings] change dropdown to accept array of objects rather than array of tuples (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@appearance50p
Patch Set: trybot fix Created 5 years, 1 month 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <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-icon/iron-icon.htm l"> 3 <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/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-radio-button/pape r-radio-button.html"> 6 <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-toggle-button/pap er-toggle-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
8 <link rel="import" href="chrome://md-settings/controls/settings_input.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_input.html">
9 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html "> 10 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html ">
10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
12 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 13 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
13 <link rel="import" href="appearance_fonts_page.html"> 14 <link rel="import" href="appearance_fonts_page.html">
14 15
15 <dom-module id="settings-appearance-page"> 16 <dom-module id="settings-appearance-page">
16 <link rel="import" type="css" 17 <link rel="import" type="css"
17 href="chrome://md-settings/settings_page/settings_page.css"> 18 href="chrome://md-settings/settings_page/settings_page.css">
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 </settings-dropdown-menu> 79 </settings-dropdown-menu>
79 </div> 80 </div>
80 <div class="settings-box split"> 81 <div class="settings-box split">
81 <div class="start" i18n-content="customizeFonts"></div> 82 <div class="start" i18n-content="customizeFonts"></div>
82 <paper-button on-tap="onCustomizeFontsTap_" 83 <paper-button on-tap="onCustomizeFontsTap_"
83 i18n-content="customizeFonts"></paper-button> 84 i18n-content="customizeFonts"></paper-button>
84 </div> 85 </div>
85 <div class="settings-box split"> 86 <div class="settings-box split">
86 <div class="start" i18n-content="pageZoom"></div> 87 <div class="start" i18n-content="pageZoom"></div>
87 <settings-dropdown-menu id="pageZoom" 88 <settings-dropdown-menu id="pageZoom"
88 pref="{{prefs.partition.default_zoom_level}}" 89 pref="{{defaultZoomLevel_}}"
89 menu-options="[[pageZoomOptions_]]"> 90 menu-options="[[pageZoomOptions_]]">
90 </settings-dropdown-menu> 91 </settings-dropdown-menu>
91 </div> 92 </div>
92 </neon-animatable> 93 </neon-animatable>
93 <neon-animatable id="appearance-fonts"> 94 <neon-animatable id="appearance-fonts">
94 <settings-subheader i18n-values="page-title:customizeFonts"> 95 <settings-subheader i18n-values="page-title:customizeFonts">
95 </settings-subheader> 96 </settings-subheader>
96 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]" 97 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]"
97 restamp> 98 restamp>
98 <settings-appearance-fonts-page prefs="{{prefs}}"> 99 <settings-appearance-fonts-page prefs="{{prefs}}">
99 </settings-appearance-fonts-page> 100 </settings-appearance-fonts-page>
100 </template> 101 </template>
101 </neon-animatable> 102 </neon-animatable>
102 </settings-animated-pages> 103 </settings-animated-pages>
103 </template> 104 </template>
104 <script src="appearance_page.js"></script> 105 <script src="appearance_page.js"></script>
105 </dom-module> 106 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698