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

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

Issue 2806203004: Reorder the Subresource filter setting to be under popups (Closed)
Patch Set: Created 3 years, 8 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 | « chrome/android/java/res/xml/site_settings_preferences.xml ('k') | no next file » | 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/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 2 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
4 <link rel="import" href="../icons.html"> 4 <link rel="import" href="../icons.html">
5 <link rel="import" href="../route.html"> 5 <link rel="import" href="../route.html">
6 <link rel="import" href="../settings_shared_css.html"> 6 <link rel="import" href="../settings_shared_css.html">
7 <link rel="import" href="../site_settings/constants.html"> 7 <link rel="import" href="../site_settings/constants.html">
8 <link rel="import" href="../site_settings/site_settings_behavior.html"> 8 <link rel="import" href="../site_settings/site_settings_behavior.html">
9 <link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html "> 9 <link rel="import" href="../site_settings/site_settings_prefs_browser_proxy.html ">
10 10
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 [[defaultSettingLabel_( 177 [[defaultSettingLabel_(
178 default_.popups, 178 default_.popups,
179 '$i18nPolymer{siteSettingsAllowed}', 179 '$i18nPolymer{siteSettingsAllowed}',
180 '$i18nPolymer{siteSettingsBlocked}')]] 180 '$i18nPolymer{siteSettingsBlocked}')]]
181 </div> 181 </div>
182 </div> 182 </div>
183 <button class="subpage-arrow" is="paper-icon-button-light" 183 <button class="subpage-arrow" is="paper-icon-button-light"
184 aria-label="$i18n{siteSettingsPopups}" 184 aria-label="$i18n{siteSettingsPopups}"
185 aria-describedby="popupsSecondary"></button> 185 aria-describedby="popupsSecondary"></button>
186 </div> 186 </div>
187 <template is="dom-if" if="[[enableSafeBrowsingSubresourceFilter_]]">
188 <div class="settings-box two-line"
189 category$="[[ContentSettingsTypes.SUBRESOURCE_FILTER]]"
190 data-route="SITE_SETTINGS_SUBRESOURCE_FILTER" on-tap="onTapNavigate_"
191 actionable>
192 <iron-icon icon="cr:open-in-new"></iron-icon>
193 <div class="middle">
194 $i18n{siteSettingsSubresourceFilter}
195 <div class="secondary" id="subresourceFilterSecondary">
196 [[defaultSettingLabel_(
197 default_.subresourceFilter,
198 '$i18nPolymer{siteSettingsSubresourceFilterBlock}',
199 '$i18nPolymer{siteSettingsSubresourceFilterAllow}')]]
200 </div>
201 </div>
202 <button class="subpage-arrow" is="paper-icon-button-light"
203 aria-label="$i18n{siteSettingsSubresourceFilter}"
204 aria-describedby="subresourceFilterSecondary"></button>
205 </div>
206 </template>
187 <div class="settings-box two-line" 207 <div class="settings-box two-line"
188 category$="[[ContentSettingsTypes.BACKGROUND_SYNC]]" 208 category$="[[ContentSettingsTypes.BACKGROUND_SYNC]]"
189 data-route="SITE_SETTINGS_BACKGROUND_SYNC" on-tap="onTapNavigate_" 209 data-route="SITE_SETTINGS_BACKGROUND_SYNC" on-tap="onTapNavigate_"
190 actionable> 210 actionable>
191 <iron-icon icon="settings:sync"></iron-icon> 211 <iron-icon icon="settings:sync"></iron-icon>
192 <div class="middle"> 212 <div class="middle">
193 $i18n{siteSettingsBackgroundSync} 213 $i18n{siteSettingsBackgroundSync}
194 <div class="secondary" id="backgroundSyncSecondary"> 214 <div class="secondary" id="backgroundSyncSecondary">
195 [[defaultSettingLabel_( 215 [[defaultSettingLabel_(
196 default_.backgroundSync, 216 default_.backgroundSync,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 [[defaultSettingLabel_( 289 [[defaultSettingLabel_(
270 default_.midiSysex, 290 default_.midiSysex,
271 '$i18nPolymer{siteSettingsMidiDevicesAsk}', 291 '$i18nPolymer{siteSettingsMidiDevicesAsk}',
272 '$i18nPolymer{siteSettingsMidiDevicesBlock}')]] 292 '$i18nPolymer{siteSettingsMidiDevicesBlock}')]]
273 </div> 293 </div>
274 </div> 294 </div>
275 <button class="subpage-arrow" is="paper-icon-button-light" 295 <button class="subpage-arrow" is="paper-icon-button-light"
276 aria-label="$i18n{siteSettingsMidiDevices}" 296 aria-label="$i18n{siteSettingsMidiDevices}"
277 aria-describedby="midiDevicesSecondary"></button> 297 aria-describedby="midiDevicesSecondary"></button>
278 </div> 298 </div>
279 <template is="dom-if" if="[[enableSafeBrowsingSubresourceFilter_]]">
280 <div class="settings-box two-line"
281 category$="[[ContentSettingsTypes.SUBRESOURCE_FILTER]]"
282 data-route="SITE_SETTINGS_SUBRESOURCE_FILTER" on-tap="onTapNavigate_"
283 actionable>
284 <iron-icon icon="cr:open-in-new"></iron-icon>
285 <div class="middle">
286 $i18n{siteSettingsSubresourceFilter}
287 <div class="secondary" id="subresourceFilterSecondary">
288 [[defaultSettingLabel_(
289 default_.subresourceFilter,
290 '$i18nPolymer{siteSettingsSubresourceFilterBlock}',
291 '$i18nPolymer{siteSettingsSubresourceFilterAllow}')]]
292 </div>
293 </div>
294 <button class="subpage-arrow" is="paper-icon-button-light"
295 aria-label="$i18n{siteSettingsSubresourceFilter}"
296 aria-describedby="subresourceFilterSecondary"></button>
297 </div>
298 </template>
299 <div class="settings-box" category$="[[ContentSettingsTypes.ZOOM_LEVELS]]" 299 <div class="settings-box" category$="[[ContentSettingsTypes.ZOOM_LEVELS]]"
300 data-route="SITE_SETTINGS_ZOOM_LEVELS" 300 data-route="SITE_SETTINGS_ZOOM_LEVELS"
301 on-tap="onTapNavigate_" actionable> 301 on-tap="onTapNavigate_" actionable>
302 <iron-icon icon="settings:zoom-in"></iron-icon> 302 <iron-icon icon="settings:zoom-in"></iron-icon>
303 <div class="middle">$i18n{siteSettingsZoomLevels}</div> 303 <div class="middle">$i18n{siteSettingsZoomLevels}</div>
304 <button class="subpage-arrow" is="paper-icon-button-light" 304 <button class="subpage-arrow" is="paper-icon-button-light"
305 aria-label="$i18n{siteSettingsZoomLevels}"></button> 305 aria-label="$i18n{siteSettingsZoomLevels}"></button>
306 </div> 306 </div>
307 <div class="settings-box" category$="[[ContentSettingsTypes.USB_DEVICES]]" 307 <div class="settings-box" category$="[[ContentSettingsTypes.USB_DEVICES]]"
308 data-route="SITE_SETTINGS_USB_DEVICES" 308 data-route="SITE_SETTINGS_USB_DEVICES"
(...skipping 13 matching lines...) Expand all
322 <div class="settings-box" data-route="SITE_SETTINGS_PROTECTED_CONTENT" 322 <div class="settings-box" data-route="SITE_SETTINGS_PROTECTED_CONTENT"
323 on-tap="onTapNavigate_" actionable> 323 on-tap="onTapNavigate_" actionable>
324 <iron-icon icon="settings:security"></iron-icon> 324 <iron-icon icon="settings:security"></iron-icon>
325 <div class="middle">$i18n{siteSettingsProtectedContent}</div> 325 <div class="middle">$i18n{siteSettingsProtectedContent}</div>
326 <button class="subpage-arrow" is="paper-icon-button-light" 326 <button class="subpage-arrow" is="paper-icon-button-light"
327 aria-label="$i18n{siteSettingsProtectedContent}"></button> 327 aria-label="$i18n{siteSettingsProtectedContent}"></button>
328 </div> 328 </div>
329 </template> 329 </template>
330 <script src="site_settings_page.js"></script> 330 <script src="site_settings_page.js"></script>
331 </dom-module> 331 </dom-module>
OLDNEW
« no previous file with comments | « chrome/android/java/res/xml/site_settings_preferences.xml ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698