Chromium Code Reviews| Index: chrome/browser/resources/settings/site_settings/site_list.js |
| diff --git a/chrome/browser/resources/settings/site_settings/site_list.js b/chrome/browser/resources/settings/site_settings/site_list.js |
| index f2fcb7c1602ae812b7a6d06487c11f0aba0b208e..acd19edc86b14a072387843fedb9842244bf40dc 100644 |
| --- a/chrome/browser/resources/settings/site_settings/site_list.js |
| +++ b/chrome/browser/resources/settings/site_settings/site_list.js |
| @@ -26,6 +26,9 @@ Polymer({ |
| behaviors: [SiteSettingsBehavior, WebUIListenerBehavior], |
| properties: { |
| + /** @private */ |
| + enableAllSitesAndDetails_: Boolean, |
|
Dan Beam
2016/10/12 17:54:05
enableAllSitesAndDetails_: {
type: Boolean,
va
dschuyler
2016/10/13 01:23:07
Done.
|
| + |
| /** |
| * The site that was selected by the user in the dropdown list. |
| * @type {SiteException} |
| @@ -117,6 +120,8 @@ Polymer({ |
| ], |
| ready: function() { |
| + this.enableAllSitesAndDetails_ = loadTimeData.getString( |
| + 'enableSiteSettingsAllSitesAndDetails'); |
| this.addWebUIListener('contentSettingSitePermissionChanged', |
| this.siteWithinCategoryChanged_.bind(this)); |
| this.addWebUIListener('onIncognitoStatusChanged', |
| @@ -418,6 +423,8 @@ Polymer({ |
| * @private |
| */ |
| onOriginTap_: function(event) { |
| + if (!this.enableAllSitesAndDetails_) |
| + return; |
| this.selectedSite = event.model.item; |
| settings.navigateTo(settings.Route.SITE_SETTINGS_SITE_DETAILS, |
| new URLSearchParams('site=' + this.selectedSite.origin)); |