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

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

Issue 2708013003: [MD settings] show icon when content settings are controlled by an extension (Closed)
Patch Set: unit test fix 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/settings_boolean_control_behavior.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/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">
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 label="$i18n{showHomeButton}" 104 label="$i18n{showHomeButton}"
105 sub-label="[[getShowHomeSubLabel_( 105 sub-label="[[getShowHomeSubLabel_(
106 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]"> 106 prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]">
107 </settings-toggle-button> 107 </settings-toggle-button>
108 </div> 108 </div>
109 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]"> 109 <template is="dom-if" if="[[prefs.browser.show_home_button.value]]">
110 <div class="list-frame" 110 <div class="list-frame"
111 hidden="[[!pageVisibility.homeButton]]"> 111 hidden="[[!pageVisibility.homeButton]]">
112 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}"> 112 <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
113 <controlled-radio-button class="list-item" name="true" 113 <controlled-radio-button class="list-item" name="true"
114 pref="[[prefs.homepage_is_newtabpage]]"> 114 pref="[[prefs.homepage_is_newtabpage]]" ignore-extensions>
115 $i18n{homePageNtp} 115 $i18n{homePageNtp}
116 </controlled-radio-button> 116 </controlled-radio-button>
117 <controlled-radio-button class="list-item" name="false" 117 <controlled-radio-button class="list-item" name="false"
118 pref="[[prefs.homepage_is_newtabpage]]"> 118 pref="[[prefs.homepage_is_newtabpage]]" ignore-extensions>
119 $i18n{other} 119 $i18n{other}
120 <!-- TODO(dbeam): this can show double indicators when both 120 <!-- TODO(dbeam): this can show double indicators when both
121 homepage and whether to use the NTP as the homepage are 121 homepage and whether to use the NTP as the homepage are
122 managed. --> 122 managed. -->
123 <settings-input no-label-float pref="{{prefs.homepage}}" 123 <settings-input no-label-float pref="{{prefs.homepage}}"
124 label="$i18n{exampleDotCom}" 124 label="$i18n{exampleDotCom}"
125 can-tab="[[!prefs.homepage_is_newtabpage.value]]" 125 can-tab="[[!prefs.homepage_is_newtabpage.value]]"
126 stop-keyboard-event-propagation> 126 stop-keyboard-event-propagation ignore-extensions>
127 </settings-input> 127 </settings-input>
128 </controlled-radio-button> 128 </controlled-radio-button>
129 <template is="dom-if" if="[[prefs.homepage.extensionId]]"> 129 <template is="dom-if" if="[[prefs.homepage.extensionId]]">
130 <extension-controlled-indicator 130 <extension-controlled-indicator
131 extension-id="[[prefs.homepage.extensionId]]" 131 extension-id="[[prefs.homepage.extensionId]]"
132 extension-can-be-disabled="[[ 132 extension-can-be-disabled="[[
133 prefs.homepage.extensionCanBeDisabled]]" 133 prefs.homepage.extensionCanBeDisabled]]"
134 extension-name="[[prefs.homepage.controlledByName]]" 134 extension-name="[[prefs.homepage.controlledByName]]"
135 on-disable-extension="onDisableExtension_"> 135 on-disable-extension="onDisableExtension_">
136 </extension-controlled-indicator> 136 </extension-controlled-indicator>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 associated-control="[[$$('#customize-fonts-subpage-trigger')]]" 193 associated-control="[[$$('#customize-fonts-subpage-trigger')]]"
194 page-title="$i18n{customizeFonts}"> 194 page-title="$i18n{customizeFonts}">
195 <settings-appearance-fonts-page prefs="{{prefs}}"> 195 <settings-appearance-fonts-page prefs="{{prefs}}">
196 </settings-appearance-fonts-page> 196 </settings-appearance-fonts-page>
197 </settings-subpage> 197 </settings-subpage>
198 </template> 198 </template>
199 </settings-animated-pages> 199 </settings-animated-pages>
200 </template> 200 </template>
201 <script src="appearance_page.js"></script> 201 <script src="appearance_page.js"></script>
202 </dom-module> 202 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/settings_boolean_control_behavior.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698