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

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

Issue 2766093002: MD Settings: validate home button url input (Closed)
Patch Set: add tests for home button urls Created 3 years, 9 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/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.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">
11 <link rel="import" href="../controls/settings_dropdown_menu.html"> 11 <link rel="import" href="../controls/settings_dropdown_menu.html">
12 <link rel="import" href="../controls/settings_input.html"> 12 <link rel="import" href="../controls/settings_input.html">
13 <link rel="import" href="../controls/settings_radio_group.html"> 13 <link rel="import" href="../controls/settings_radio_group.html">
14 <link rel="import" href="../controls/settings_toggle_button.html"> 14 <link rel="import" href="../controls/settings_toggle_button.html">
15 <link rel="import" href="../route.html"> 15 <link rel="import" href="../route.html">
16 <link rel="import" href="../settings_page/settings_animated_pages.html"> 16 <link rel="import" href="../settings_page/settings_animated_pages.html">
17 <link rel="import" href="../settings_page/settings_subpage.html"> 17 <link rel="import" href="../settings_page/settings_subpage.html">
18 <link rel="import" href="../settings_shared_css.html"> 18 <link rel="import" href="../settings_shared_css.html">
19 <link rel="import" href="../settings_vars_css.html"> 19 <link rel="import" href="../settings_vars_css.html">
20 <link rel="import" href="appearance_fonts_page.html"> 20 <link rel="import" href="appearance_fonts_page.html">
21 21
22 <dom-module id="settings-appearance-page"> 22 <dom-module id="settings-appearance-page">
23 <template> 23 <template>
24 <style include="settings-shared md-select"> 24 <style include="settings-shared md-select">
25 .secondary-button ~ .secondary-button { 25 .secondary-button ~ .secondary-button {
26 -webkit-margin-start: 12px; 26 -webkit-margin-start: 12px;
27 } 27 }
28 28
29 #custom-input {
30 margin-bottom: 1rem;
31 }
32
29 #customHomePage { 33 #customHomePage {
30 width: 200px; 34 --paper-input-container: {
35 width: 200px;
36 };
31 } 37 }
32 </style> 38 </style>
33 <settings-animated-pages id="pages" section="appearance"> 39 <settings-animated-pages id="pages" section="appearance">
34 <neon-animatable route-path="default"> 40 <neon-animatable route-path="default">
35 <if expr="chromeos"> 41 <if expr="chromeos">
36 <div class="settings-box first two-line" id="wallpaperButton" 42 <div class="settings-box first two-line" id="wallpaperButton"
37 on-tap="openWallpaperManager_" actionable 43 on-tap="openWallpaperManager_" actionable
38 hidden="[[!pageVisibility.setWallpaper]]"> 44 hidden="[[!pageVisibility.setWallpaper]]">
39 <div class="start"> 45 <div class="start">
40 $i18n{setWallpaper} 46 $i18n{setWallpaper}
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 </settings-toggle-button> 112 </settings-toggle-button>
107 </div> 113 </div>
108 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 114 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
109 <div class="list-frame" hidden="[[!pageVisibility.homeButton]]"> 115 <div class="list-frame" hidden="[[!pageVisibility.homeButton]]">
110 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> 116 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
111 <controlled-radio-button class="list-item" name="true" 117 <controlled-radio-button class="list-item" name="true"
112 pref="[[prefs.homepage_is_newtabpage]]" 118 pref="[[prefs.homepage_is_newtabpage]]"
113 label="$i18n{homePageNtp}" no-extension-indicator> 119 label="$i18n{homePageNtp}" no-extension-indicator>
114 </controlled-radio-button> 120 </controlled-radio-button>
115 <controlled-radio-button class="list-item" name="false" 121 <controlled-radio-button class="list-item" name="false"
116 pref="[[prefs.homepage_is_newtabpage]]" 122 pref="[[prefs.homepage_is_newtabpage]]" id="custom-input"
dpapad 2017/03/24 01:39:31 Nit (optional): It is more common to have the id="
scottchen 2017/03/24 20:48:54 Done.
117 no-extension-indicator> 123 no-extension-indicator>
118 <!-- TODO(dbeam): this can show double indicators when both 124 <!-- TODO(dbeam): this can show double indicators when both
119 homepage and whether to use the NTP as the homepage are 125 homepage and whether to use the NTP as the homepage are
120 managed. --> 126 managed. -->
121 <settings-input id="customHomePage" 127 <settings-input id="customHomePage"
122 no-label-float pref="{{prefs.homepage}}" 128 no-label-float pref="{{prefs.homepage}}"
123 label="$i18n{enterCustomWebAddress}" 129 label="$i18n{enterCustomWebAddress}"
124 can-tab="[[!prefs.homepage_is_newtabpage.value]]" 130 can-tab="[[!prefs.homepage_is_newtabpage.value]]"
125 stop-keyboard-event-propagation no-extension-indicator> 131 stop-keyboard-event-propagation no-extension-indicator
dpapad 2017/03/24 01:39:31 Is settings-input used anywhere else besides the a
dpapad 2017/03/24 18:07:16 Looking in git history revealed that at some point
scottchen 2017/03/24 20:48:54 I think since I already added stuff in settings-in
132 error-message="$i18n{homeUrlNotValid}"
133 on-input="validate_">
126 </settings-input> 134 </settings-input>
127 </controlled-radio-button> 135 </controlled-radio-button>
128 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> 136 <template is="dom-if" if="[[prefs.homepage.extensionId]]">
129 <extension-controlled-indicator 137 <extension-controlled-indicator
130 extension-id="[[prefs.homepage.extensionId]]" 138 extension-id="[[prefs.homepage.extensionId]]"
131 extension-can-be-disabled="[[ 139 extension-can-be-disabled="[[
132 prefs.homepage.extensionCanBeDisabled]]" 140 prefs.homepage.extensionCanBeDisabled]]"
133 extension-name="[[prefs.homepage.controlledByName]]" 141 extension-name="[[prefs.homepage.controlledByName]]"
134 on-disable-extension="onDisableExtension_"> 142 on-disable-extension="onDisableExtension_">
135 </extension-controlled-indicator> 143 </extension-controlled-indicator>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 198 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
191 page-title="$i18n{customizeFonts}"> 199 page-title="$i18n{customizeFonts}">
192 <settings-appearance-fonts-page prefs="{{prefs}}"> 200 <settings-appearance-fonts-page prefs="{{prefs}}">
193 </settings-appearance-fonts-page> 201 </settings-appearance-fonts-page>
194 </settings-subpage> 202 </settings-subpage>
195 </template> 203 </template>
196 </settings-animated-pages> 204 </settings-animated-pages>
197 </template> 205 </template>
198 <script src="appearance_page.js"></script> 206 <script src="appearance_page.js"></script>
199 </dom-module> 207 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698