Chromium Code Reviews| OLD | NEW |
|---|---|
| 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"> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> | 60 <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> |
| 61 <div class="secondary-action"> | 61 <div class="secondary-action"> |
| 62 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 62 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
| 63 class="secondary-button"> | 63 class="secondary-button"> |
| 64 $i18n{resetToDefaultTheme} | 64 $i18n{resetToDefaultTheme} |
| 65 </paper-button> | 65 </paper-button> |
| 66 </div> | 66 </div> |
| 67 </template> | 67 </template> |
| 68 </if> | 68 </if> |
| 69 <if expr="is_linux and not chromeos"> | 69 <if expr="is_linux and not chromeos"> |
| 70 <div class="secondary-action"> | 70 <template is="dom-if" if="[[showThemesSecondary_( |
| 71 <template is="dom-if" if="[[showUseClassic_( | 71 prefs.extensions.theme.id.value, useSystemTheme_)]]"> |
| 72 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 72 <div class="secondary-action"> |
|
dpapad
2016/10/18 17:49:34
Can we just make this div hidden instead of wrappi
Dan Beam
2016/10/18 18:59:52
Done.
| |
| 73 <paper-button id="useDefault" on-tap="onUseDefaultTap_" | 73 <template is="dom-if" if="[[showUseClassic_( |
| 74 class="secondary-button"> | 74 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
| 75 $i18n{useClassicTheme} | 75 <paper-button id="useDefault" on-tap="onUseDefaultTap_" |
| 76 </paper-button> | 76 class="secondary-button"> |
| 77 </template> | 77 $i18n{useClassicTheme} |
| 78 <template is="dom-if" if="[[showUseSystem_( | 78 </paper-button> |
| 79 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> | 79 </template> |
| 80 <paper-button id="useSystem" on-tap="onUseSystemTap_" | 80 <template is="dom-if" if="[[showUseSystem_( |
|
dpapad
2016/10/18 17:49:34
Can we add a test regarding showing/hiding the the
Dan Beam
2016/10/18 18:59:52
Done.
| |
| 81 class="secondary-button"> | 81 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> |
| 82 $i18n{useSystemTheme} | 82 <paper-button id="useSystem" on-tap="onUseSystemTap_" |
| 83 </paper-button> | 83 class="secondary-button"> |
| 84 </template> | 84 $i18n{useSystemTheme} |
| 85 </div> | 85 </paper-button> |
| 86 </template> | |
| 87 </div> | |
| 88 </template> | |
| 86 </if> | 89 </if> |
| 87 </div> | 90 </div> |
| 88 <div class="settings-box" | 91 <div class="settings-box" |
| 89 hidden="[[!pageVisibility.homeButton]]"> | 92 hidden="[[!pageVisibility.homeButton]]"> |
| 90 <settings-checkbox class="start" label="$i18n{showHomeButton}" | 93 <settings-checkbox class="start" label="$i18n{showHomeButton}" |
| 91 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" | 94 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" |
| 92 pref="{{prefs.browser.show_home_button}}"> | 95 pref="{{prefs.browser.show_home_button}}"> |
| 93 </settings-checkbox> | 96 </settings-checkbox> |
| 94 </div> | 97 </div> |
| 95 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> | 98 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" | 166 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" |
| 164 page-title="$i18n{customizeFonts}"> | 167 page-title="$i18n{customizeFonts}"> |
| 165 <settings-appearance-fonts-page prefs="{{prefs}}"> | 168 <settings-appearance-fonts-page prefs="{{prefs}}"> |
| 166 </settings-appearance-fonts-page> | 169 </settings-appearance-fonts-page> |
| 167 </settings-subpage> | 170 </settings-subpage> |
| 168 </template> | 171 </template> |
| 169 </settings-animated-pages> | 172 </settings-animated-pages> |
| 170 </template> | 173 </template> |
| 171 <script src="appearance_page.js"></script> | 174 <script src="appearance_page.js"></script> |
| 172 </dom-module> | 175 </dom-module> |
| OLD | NEW |