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

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

Issue 2516503002: MD Settings: add extension-controlled indicator to homepage (Closed)
Patch Set: different slot Created 4 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/extension_controlled_indicator.html">
9 <link rel="import" href="/controls/settings_dropdown_menu.html"> 10 <link rel="import" href="/controls/settings_dropdown_menu.html">
10 <link rel="import" href="/controls/settings_input.html"> 11 <link rel="import" href="/controls/settings_input.html">
11 <link rel="import" href="/controls/settings_radio_group.html"> 12 <link rel="import" href="/controls/settings_radio_group.html">
12 <link rel="import" href="/md_select_css.html"> 13 <link rel="import" href="/md_select_css.html">
13 <link rel="import" href="/route.html"> 14 <link rel="import" href="/route.html">
14 <link rel="import" href="/settings_page/settings_animated_pages.html"> 15 <link rel="import" href="/settings_page/settings_animated_pages.html">
15 <link rel="import" href="/settings_page/settings_subpage.html"> 16 <link rel="import" href="/settings_page/settings_subpage.html">
16 <link rel="import" href="/settings_shared_css.html"> 17 <link rel="import" href="/settings_shared_css.html">
17 <link rel="import" href="appearance_fonts_page.html"> 18 <link rel="import" href="appearance_fonts_page.html">
18 19
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 $i18n{other} 107 $i18n{other}
107 <!-- TODO(dbeam): this can show double indicators when both 108 <!-- TODO(dbeam): this can show double indicators when both
108 homepage and whether to use the NTP as the homepage are 109 homepage and whether to use the NTP as the homepage are
109 managed. --> 110 managed. -->
110 <settings-input no-label-float pref="{{prefs.homepage}}" 111 <settings-input no-label-float pref="{{prefs.homepage}}"
111 label="$i18n{exampleDotCom}" 112 label="$i18n{exampleDotCom}"
112 can-tab="[[!prefs.homepage_is_newtabpage.value]]" 113 can-tab="[[!prefs.homepage_is_newtabpage.value]]"
113 stop-keyboard-event-propagation> 114 stop-keyboard-event-propagation>
114 </settings-input> 115 </settings-input>
115 </controlled-radio-button> 116 </controlled-radio-button>
117 <template is="dom-if" if="[[prefs.homepage.extensionId]]">
118 <extension-controlled-indicator
119 extension-id="[[prefs.homepage.extensionId]]"
120 extension-can-be-disabled="[[prefs.homepage.extensionCanBeDi sabled]]"
Dan Beam 2016/11/17 23:28:23 both of these are long names... suggestions on how
dpapad 2016/11/17 23:36:05 How about the following? extension-can-be-disable
Dan Beam 2016/11/17 23:45:38 Done.
121 extension-name="[[prefs.homepage.controlledByName]]"
122 on-disable-extension="onDisableExtension_">
123 </extension-controlled-indicator>
124 </template>
116 </settings-radio-group> 125 </settings-radio-group>
117 </div> 126 </div>
118 </template> 127 </template>
119 <div class="settings-box" 128 <div class="settings-box"
120 hidden="[[!pageVisibility.bookmarksBar]]"> 129 hidden="[[!pageVisibility.bookmarksBar]]">
121 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" 130 <settings-checkbox class="start" label="$i18n{showBookmarksBar}"
122 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 131 pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
123 </settings-checkbox> 132 </settings-checkbox>
124 </div> 133 </div>
125 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> 134 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]">
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 175 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
167 page-title="$i18n{customizeFonts}"> 176 page-title="$i18n{customizeFonts}">
168 <settings-appearance-fonts-page prefs="{{prefs}}"> 177 <settings-appearance-fonts-page prefs="{{prefs}}">
169 </settings-appearance-fonts-page> 178 </settings-appearance-fonts-page>
170 </settings-subpage> 179 </settings-subpage>
171 </template> 180 </template>
172 </settings-animated-pages> 181 </settings-animated-pages>
173 </template> 182 </template>
174 <script src="appearance_page.js"></script> 183 <script src="appearance_page.js"></script>
175 </dom-module> 184 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/appearance_page/appearance_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698