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

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

Issue 1841973004: [MD settings] theme name shown in sub-label, wallpaper chrome os only (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review changes Created 4 years, 8 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/iron-icons/device-icons .html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/device-icons .html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/image-icons. html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
11 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> 11 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
12 <link rel="import" href="chrome://md-settings/controls/settings_input.html"> 12 <link rel="import" href="chrome://md-settings/controls/settings_input.html">
13 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html "> 13 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html ">
14 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 14 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
15 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 15 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
16 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 16 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
17 <link rel="import" href="appearance_fonts_page.html"> 17 <link rel="import" href="appearance_fonts_page.html">
18 18
19 <dom-module id="settings-appearance-page"> 19 <dom-module id="settings-appearance-page">
20 <link rel="import" type="css" 20 <link rel="import" type="css"
21 href="chrome://md-settings/appearance_page/appearance_shared.css"> 21 href="chrome://md-settings/appearance_page/appearance_shared.css">
22 <link rel="import" type="css" href="chrome://resources/css/widgets.css"> 22 <link rel="import" type="css" href="chrome://resources/css/widgets.css">
23 <link rel="import" href="chrome://resources/html/action_link.html"> 23 <link rel="import" href="chrome://resources/html/action_link.html">
24 <template> 24 <template>
25 <style include="settings-shared"></style> 25 <style include="settings-shared"></style>
26 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 26 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
27 section="appearance"> 27 section="appearance">
28 <neon-animatable id="main"> 28 <neon-animatable id="main">
29 <if expr="chromeos">
29 <div class="settings-box first two-line"> 30 <div class="settings-box first two-line">
30 <iron-icon icon="device:wallpaper"></iron-icon> 31 <iron-icon icon="device:wallpaper"></iron-icon>
31 <paper-button class="primary-button middle"> 32 <paper-button class="primary-button middle">
32 <div>[[i18n('setWallpaper')]]</div> 33 <div>[[i18n('setWallpaper')]]</div>
michaelpg 2016/03/31 20:48:14 this and below: make these OS_CHROMEOS only in md_
dschuyler 2016/03/31 21:08:22 Done.
33 <div class="secondary">[[i18n('openWallpaperApp')]]</div> 34 <div class="secondary">[[i18n('openWallpaperApp')]]</div>
34 </paper-button> 35 </paper-button>
35 </div> 36 </div>
37 </if>
36 <div class="settings-box two-line"> 38 <div class="settings-box two-line">
37 <iron-icon icon="image:palette"></iron-icon> 39 <iron-icon icon="image:palette"></iron-icon>
38 <paper-button class="primary-button middle" id="get-themes" 40 <paper-button class="primary-button middle" id="get-themes"
39 on-tap="openThemesGallery_"> 41 on-tap="openThemesGallery_">
40 <div>[[i18n('getThemes')]]</div> 42 <div>[[i18n('getThemes')]]</div>
41 <div class="secondary">[[i18n('chooseFromWebStore')]]</div> 43 <div class="secondary">[[themeSublabel_]]</div>
42 </paper-button> 44 </paper-button>
43 <template is="dom-if" if="[[allowResetTheme_]]"> 45 <template is="dom-if" if="[[allowResetTheme_]]">
44 <paper-button on-tap="resetTheme_" 46 <paper-button on-tap="resetTheme_" class="secondary-action"
45 >[[i18n('resetToDefaultTheme')]]</paper-button> 47 >[[i18n('resetToDefaultTheme')]]</paper-button>
46 </template> 48 </template>
47 </div> 49 </div>
48 <div class="settings-box two-line"> 50 <div class="settings-box two-line">
49 <settings-checkbox class="start" i18n-values="label:showHomeButton" 51 <settings-checkbox class="start" i18n-values="label:showHomeButton"
50 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" 52 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]"
51 pref="{{prefs.browser.show_home_button}}"> 53 pref="{{prefs.browser.show_home_button}}">
52 </settings-checkbox> 54 </settings-checkbox>
53 </div> 55 </div>
54 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 56 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]" 99 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]"
98 restamp> 100 restamp>
99 <settings-appearance-fonts-page prefs="{{prefs}}"> 101 <settings-appearance-fonts-page prefs="{{prefs}}">
100 </settings-appearance-fonts-page> 102 </settings-appearance-fonts-page>
101 </template> 103 </template>
102 </neon-animatable> 104 </neon-animatable>
103 </settings-animated-pages> 105 </settings-animated-pages>
104 </template> 106 </template>
105 <script src="appearance_page.js"></script> 107 <script src="appearance_page.js"></script>
106 </dom-module> 108 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698