| Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
|
| diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
| index de004680b9adbc815987088c8c3c5344f9ec5a13..c65111dd8a20ffd6363b686f8fd08b3e412e5b44 100644
|
| --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
| +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
|
| @@ -123,33 +123,31 @@
|
| </settings-subpage>
|
| </template>
|
|
|
| - <template is="dom-if" name="all-sites">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryAllSites}">
|
| + <template is="dom-if" name="all-sites" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryAllSites}">
|
| <all-sites selected-site="{{selectedSite}}"></all-sites>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-automatic-downloads">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsAutomaticDownloads}">
|
| + <template is="dom-if" name="site-settings-category-automatic-downloads"
|
| + no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsAutomaticDownloads}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-background-sync">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsBackgroundSync}">
|
| + <template is="dom-if" name="site-settings-category-background-sync"
|
| + no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsBackgroundSync}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-camera">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryCamera}">
|
| + <template is="dom-if" name="site-settings-category-camera" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryCamera}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.CAMERA}}">
|
| @@ -157,9 +155,8 @@
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-cookies">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryCookies}">
|
| + <template is="dom-if" name="site-settings-category-cookies" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.COOKIES}}">
|
| @@ -174,51 +171,45 @@
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-images">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryImages}">
|
| + <template is="dom-if" name="site-settings-category-images" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryImages}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.IMAGES}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-location">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryLocation}">
|
| + <template is="dom-if" name="site-settings-category-location" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryLocation}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.GEOLOCATION}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="protocol-handlers">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryHandlers}">
|
| + <template is="dom-if" name="protocol-handlers" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryHandlers}">
|
| <protocol-handlers></protocol-handlers>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-javascript">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryJavascript}">
|
| + <template is="dom-if" name="site-settings-category-javascript" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryJavascript}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.JAVASCRIPT}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-keygen">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsKeygen}">
|
| + <template is="dom-if" name="site-settings-category-keygen" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsKeygen}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.KEYGEN}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-microphone">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryMicrophone}">
|
| + <template is="dom-if" name="site-settings-category-microphone" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryMicrophone}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.MIC}}">
|
| @@ -226,36 +217,34 @@
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-notifications">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryNotifications}">
|
| + <template is="dom-if" name="site-settings-category-notifications"
|
| + no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryNotifications}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.NOTIFICATIONS}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-plugins">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsPlugins}">
|
| + <template is="dom-if" name="site-settings-category-plugins" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsPlugins}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.PLUGINS}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-popups">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsCategoryPopups}">
|
| + <template is="dom-if" name="site-settings-category-popups" no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.POPUPS}}">
|
| </site-settings-category>
|
| </settings-subpage>
|
| </template>
|
| - <template is="dom-if" name="site-settings-category-unsandboxed-plugins">
|
| - <settings-subpage no-associated-control
|
| - page-title="$i18n{siteSettingsUnsandboxedPlugins}">
|
| + <template is="dom-if" name="site-settings-category-unsandboxed-plugins"
|
| + no-search>
|
| + <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}">
|
| <site-settings-category
|
| selected-site="{{selectedSite}}"
|
| category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
|
| @@ -263,9 +252,8 @@
|
| </settings-subpage>
|
| </template>
|
|
|
| - <template is="dom-if" name="site-details">
|
| - <settings-subpage no-associated-control
|
| - page-title="[[selectedSite.originForDisplay]]">
|
| + <template is="dom-if" name="site-details" no-search>
|
| + <settings-subpage page-title="[[selectedSite.originForDisplay]]">
|
| <site-details site="[[selectedSite]]"></site-details>
|
| </settings-subpage>
|
| </template>
|
|
|