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

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: 80 col wrap 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 class="secondary-button"> 83 class="secondary-button">
83 $i18n{useSystemTheme} 84 $i18n{useSystemTheme}
84 </paper-button> 85 </paper-button>
85 </template> 86 </template>
86 </div> 87 </div>
87 </if> 88 </if>
88 </div> 89 </div>
89 <div class="settings-box" 90 <div class="settings-box"
90 hidden="[[!pageVisibility.homeButton]]"> 91 hidden="[[!pageVisibility.homeButton]]">
91 <settings-checkbox class="start" label="$i18n{showHomeButton}" 92 <settings-checkbox class="start" label="$i18n{showHomeButton}"
92 sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.val ue, prefs.homepage.value)]]" 93 sub-label="[[getShowHomeSubLabel_(
94 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]"
93 pref="{{prefs.browser.show_home_button}}"> 95 pref="{{prefs.browser.show_home_button}}">
94 </settings-checkbox> 96 </settings-checkbox>
95 </div> 97 </div>
96 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 98 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
97 <div class="list-frame" 99 <div class="list-frame"
98 hidden="[[!pageVisibility.homeButton]]"> 100 hidden="[[!pageVisibility.homeButton]]">
99 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> 101 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
100 <controlled-radio-button class="list-item" name="true" 102 <controlled-radio-button class="list-item" name="true"
101 pref="[[prefs.homepage_is_newtabpage]]"> 103 pref="[[prefs.homepage_is_newtabpage]]">
102 $i18n{homePageNtp} 104 $i18n{homePageNtp}
103 </controlled-radio-button> 105 </controlled-radio-button>
104 <controlled-radio-button class="list-item" name="false" 106 <controlled-radio-button class="list-item" name="false"
105 pref="[[prefs.homepage_is_newtabpage]]"> 107 pref="[[prefs.homepage_is_newtabpage]]">
106 $i18n{other} 108 $i18n{other}
107 <!-- TODO(dbeam): this can show double indicators when both 109 <!-- TODO(dbeam): this can show double indicators when both
108 homepage and whether to use the NTP as the homepage are 110 homepage and whether to use the NTP as the homepage are
109 managed. --> 111 managed. -->
110 <settings-input no-label-float pref="{{prefs.homepage}}" 112 <settings-input no-label-float pref="{{prefs.homepage}}"
111 label="$i18n{exampleDotCom}" 113 label="$i18n{exampleDotCom}"
112 can-tab="[[!prefs.homepage_is_newtabpage.value]]" 114 can-tab="[[!prefs.homepage_is_newtabpage.value]]"
113 stop-keyboard-event-propagation> 115 stop-keyboard-event-propagation>
114 </settings-input> 116 </settings-input>
115 </controlled-radio-button> 117 </controlled-radio-button>
118 <template is="dom-if" if="[[prefs.homepage.extensionId]]">
119 <extension-controlled-indicator
120 extension-id="[[prefs.homepage.extensionId]]"
121 extension-can-be-disabled="[[
122 prefs.homepage.extensionCanBeDisabled]]"
123 extension-name="[[prefs.homepage.controlledByName]]"
124 on-disable-extension="onDisableExtension_">
125 </extension-controlled-indicator>
126 </template>
116 </settings-radio-group> 127 </settings-radio-group>
117 </div> 128 </div>
118 </template> 129 </template>
119 <div class="settings-box" 130 <div class="settings-box"
120 hidden="[[!pageVisibility.bookmarksBar]]"> 131 hidden="[[!pageVisibility.bookmarksBar]]">
121 <settings-checkbox class="start" label="$i18n{showBookmarksBar}" 132 <settings-checkbox class="start" label="$i18n{showBookmarksBar}"
122 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 133 pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
123 </settings-checkbox> 134 </settings-checkbox>
124 </div> 135 </div>
125 <div class$="settings-box [[getFirst_(pageVisibility.bookmarksBar)]]"> 136 <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')]]" 177 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
167 page-title="$i18n{customizeFonts}"> 178 page-title="$i18n{customizeFonts}">
168 <settings-appearance-fonts-page prefs="{{prefs}}"> 179 <settings-appearance-fonts-page prefs="{{prefs}}">
169 </settings-appearance-fonts-page> 180 </settings-appearance-fonts-page>
170 </settings-subpage> 181 </settings-subpage>
171 </template> 182 </template>
172 </settings-animated-pages> 183 </settings-animated-pages>
173 </template> 184 </template>
174 <script src="appearance_page.js"></script> 185 <script src="appearance_page.js"></script>
175 </dom-module> 186 </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