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

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

Issue 2861443003: MD Settings: Fix subpage visibility and add appearance page tests (Closed)
Patch Set: Remove cleanup Created 3 years, 7 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/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
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-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="appearance_browser_proxy.html"> 8 <link rel="import" href="appearance_browser_proxy.html">
9 <link rel="import" href="../controls/controlled_radio_button.html"> 9 <link rel="import" href="../controls/controlled_radio_button.html">
10 <link rel="import" href="../controls/extension_controlled_indicator.html"> 10 <link rel="import" href="../controls/extension_controlled_indicator.html">
(...skipping 23 matching lines...) Expand all
34 --paper-input-container: { 34 --paper-input-container: {
35 width: 200px; 35 width: 200px;
36 }; 36 };
37 width: 100%; /* Pushes policy indicators to end. */ 37 width: 100%; /* Pushes policy indicators to end. */
38 } 38 }
39 </style> 39 </style>
40 <settings-animated-pages id="pages" section="appearance" 40 <settings-animated-pages id="pages" section="appearance"
41 focus-config="[[focusConfig_]]"> 41 focus-config="[[focusConfig_]]">
42 <neon-animatable route-path="default"> 42 <neon-animatable route-path="default">
43 <if expr="chromeos"> 43 <if expr="chromeos">
44 <div class="settings-box first two-line" id="wallpaperButton" 44 <div class="settings-box first two-line" id="setWallpaper"
45 on-tap="openWallpaperManager_" actionable 45 on-tap="openWallpaperManager_" actionable
46 hidden="[[!pageVisibility.setWallpaper]]"> 46 hidden="[[!pageVisibility.setWallpaper]]">
47 <div class="start"> 47 <div class="start">
48 $i18n{setWallpaper} 48 $i18n{setWallpaper}
49 <div class="secondary" id="wallpaperSecondary"> 49 <div class="secondary" id="wallpaperSecondary">
50 $i18n{openWallpaperApp} 50 $i18n{openWallpaperApp}
51 </div> 51 </div>
52 </div> 52 </div>
53 <button class="icon-external" is="paper-icon-button-light" 53 <button class="icon-external" is="paper-icon-button-light"
54 aria-label="$i18n{setWallpaper}" 54 aria-label="$i18n{setWallpaper}"
55 aria-describedby="wallpaperSecondary"></button> 55 aria-describedby="wallpaperSecondary"></button>
56 </div> 56 </div>
57 <div class="settings-box two-line" 57 <div id="setTheme" class="settings-box two-line"
58 hidden="[[!pageVisibility.setTheme]]"> 58 hidden="[[!pageVisibility.setTheme]]">
59 </if> 59 </if>
60 <if expr="not chromeos"> 60 <if expr="not chromeos">
61 <div class="settings-box two-line first" 61 <div id="setTheme" class="settings-box two-line first"
62 hidden="[[!pageVisibility.setTheme]]"> 62 hidden="[[!pageVisibility.setTheme]]">
63 </if> 63 </if>
64 <a class="start two-line inherit-color no-outline" tabindex="-1" 64 <a class="start two-line inherit-color no-outline" tabindex="-1"
65 target="_blank" href$="[[getThemeHref_(themeUrl_)]]"> 65 target="_blank" href$="[[getThemeHref_(themeUrl_)]]">
66 <div class="flex"> 66 <div class="flex">
67 $i18n{themes} 67 $i18n{themes}
68 <div class="secondary" id="themesSecondary"> 68 <div class="secondary" id="themesSecondary">
69 [[themeSublabel_]] 69 [[themeSublabel_]]
70 </div> 70 </div>
71 </div> 71 </div>
(...skipping 25 matching lines...) Expand all
97 <template is="dom-if" if="[[showUseSystem_( 97 <template is="dom-if" if="[[showUseSystem_(
98 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp> 98 prefs.extensions.theme.id.value, useSystemTheme_)]]" restamp>
99 <paper-button id="useSystem" on-tap="onUseSystemTap_" 99 <paper-button id="useSystem" on-tap="onUseSystemTap_"
100 class="secondary-button"> 100 class="secondary-button">
101 $i18n{useSystemTheme} 101 $i18n{useSystemTheme}
102 </paper-button> 102 </paper-button>
103 </template> 103 </template>
104 </div> 104 </div>
105 </if> 105 </if>
106 </div> 106 </div>
107 <div class="settings-box" 107 <div id="homeButton" class="settings-box"
108 hidden="[[!pageVisibility.homeButton]]"> 108 hidden="[[!pageVisibility.homeButton]]">
109 <settings-toggle-button class="start" elide-label 109 <settings-toggle-button class="start" elide-label
110 pref="{{prefs.browser.show_home_button}}" 110 pref="{{prefs.browser.show_home_button}}"
111 label="$i18n{showHomeButton}" 111 label="$i18n{showHomeButton}"
112 sub-label="[[getShowHomeSubLabel_( 112 sub-label="[[getShowHomeSubLabel_(
113 prefs.browser.show_home_button.value, 113 prefs.browser.show_home_button.value,
114 prefs.homepage_is_newtabpage.value, 114 prefs.homepage_is_newtabpage.value,
115 prefs.homepage.value)]]"> 115 prefs.homepage.value)]]">
116 </settings-toggle-button> 116 </settings-toggle-button>
117 </div> 117 </div>
(...skipping 19 matching lines...) Expand all
137 extension-id="[[prefs.homepage.extensionId]]" 137 extension-id="[[prefs.homepage.extensionId]]"
138 extension-can-be-disabled="[[ 138 extension-can-be-disabled="[[
139 prefs.homepage.extensionCanBeDisabled]]" 139 prefs.homepage.extensionCanBeDisabled]]"
140 extension-name="[[prefs.homepage.controlledByName]]" 140 extension-name="[[prefs.homepage.controlledByName]]"
141 on-disable-extension="onDisableExtension_"> 141 on-disable-extension="onDisableExtension_">
142 </extension-controlled-indicator> 142 </extension-controlled-indicator>
143 </template> 143 </template>
144 </settings-radio-group> 144 </settings-radio-group>
145 </div> 145 </div>
146 </template> 146 </template>
147 <div class="settings-box" 147 <div id="bookmarksBar" class="settings-box"
148 hidden="[[!pageVisibility.bookmarksBar]]"> 148 hidden="[[!pageVisibility.bookmarksBar]]">
149 <settings-toggle-button class="start" 149 <settings-toggle-button class="start"
150 pref="{{prefs.bookmark_bar.show_on_all_tabs}}" 150 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
151 label="$i18n{showBookmarksBar}"> 151 label="$i18n{showBookmarksBar}">
152 </settings-toggle-button> 152 </settings-toggle-button>
153 </div> 153 </div>
154 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> 154 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]">
155 <if expr="is_linux and not chromeos"> 155 <if expr="is_linux and not chromeos">
156 <settings-toggle-button class="start" 156 <settings-toggle-button class="start"
157 pref="{{prefs.browser.custom_chrome_frame}}" 157 pref="{{prefs.browser.custom_chrome_frame}}"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 196 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
197 page-title="$i18n{customizeFonts}"> 197 page-title="$i18n{customizeFonts}">
198 <settings-appearance-fonts-page prefs="{{prefs}}"> 198 <settings-appearance-fonts-page prefs="{{prefs}}">
199 </settings-appearance-fonts-page> 199 </settings-appearance-fonts-page>
200 </settings-subpage> 200 </settings-subpage>
201 </template> 201 </template>
202 </settings-animated-pages> 202 </settings-animated-pages>
203 </template> 203 </template>
204 <script src="appearance_page.js"></script> 204 <script src="appearance_page.js"></script>
205 </dom-module> 205 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698