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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 1826683002: MD Settings: Lazy-load sub-pages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@WebAnimationsExterns
Patch Set: no-op Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.html ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | chrome/test/data/webui/settings/settings_page_browsertest.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 801b47a95c79a0b6aa7999a937c381becde9d739..e15372fe62f4fe9fa2ce1aa35d748964692f613e 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -1,3 +1,4 @@
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
@@ -8,7 +9,7 @@
<link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html">
<link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
-<link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
+<link rel="import" href="chrome://md-settings/settings_page/settings_subpage.html">
<link rel="import" href="chrome://md-settings/settings_shared_css.html">
<link rel="import" href="chrome://md-settings/site_settings/all_sites.html">
<link rel="import" href="chrome://md-settings/site_settings/constants.html">
@@ -98,125 +99,124 @@
</div>
</neon-animatable>
<if expr="use_nss_certs">
- <neon-animatable id="manage-certificates">
- <settings-subheader i18n-values="page-title:manageCertificates">
- </settings-subheader>
- <settings-certificate-manager-page>
- </settings-certificate-manager-page>
- </neon-animatable>
+ <template is="dom-if" name="manage-certificates">
+ <settings-subpage page-title="[[i18n('manageCertificates')]]">
+ <settings-certificate-manager-page>
+ </settings-certificate-manager-page>
+ </settings-subpage>
+ </template>
</if>
- <neon-animatable id="site-settings">
- <settings-subheader i18n-values="page-title:siteSettings">
- </settings-subheader>
- <settings-site-settings-page current-route="{{currentRoute}}"
- category-selected="{{categorySelected}}">
- </settings-site-settings-page>
- </neon-animatable>
+ <template is="dom-if" name="site-settings">
+ <settings-subpage id="site-settings"
+ page-title="[[i18n('siteSettings')]]">
+ <settings-site-settings-page current-route="{{currentRoute}}"
+ category-selected="{{categorySelected}}">
+ </settings-site-settings-page>
+ </settings-subpage>
+ </template>
- <neon-animatable id="all-sites">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryAllSites">
- </settings-subheader>
- <all-sites
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}">
- </all-sites>
- </neon-animatable>
- <neon-animatable id="site-settings-category-camera">
- <settings-subheader i18n-values="page-title:siteSettingsCategoryCamera">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.CAMERA}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-cookies">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryCookies">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.COOKIES}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-fullscreen">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryFullscreen">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.FULLSCREEN}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-images">
- <settings-subheader i18n-values="page-title:siteSettingsCategoryImages">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.IMAGES}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-location">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryLocation">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.GEOLOCATION}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-javascript">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryJavascript">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.JAVASCRIPT}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-microphone">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryMicrophone">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.MIC}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-notifications">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryNotifications">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.NOTIFICATIONS}}">
- </site-settings-category>
- </neon-animatable>
- <neon-animatable id="site-settings-category-popups">
- <settings-subheader
- i18n-values="page-title:siteSettingsCategoryPopups">
- </settings-subheader>
- <site-settings-category
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
- category="{{ContentSettingsTypes.POPUPS}}">
- </site-settings-category>
- </neon-animatable>
+ <template is="dom-if" name="all-sites">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryAllSites')]]">
+ <all-sites
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}">
+ </all-sites>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-camera">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryCamera')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.CAMERA}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-cookies">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryCookies')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.COOKIES}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-fullscreen">
+ <settings-subpage
+ page-title="[[i18n('siteSettingsCategoryFullscreen')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.FULLSCREEN}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-images">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryImages')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.IMAGES}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-location">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryLocation')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.GEOLOCATION}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-javascript">
+ <settings-subpage
+ page-title="[[i18n('siteSettingsCategoryJavascript')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.JAVASCRIPT}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-microphone">
+ <settings-subpage
+ page-title="[[i18n('siteSettingsCategoryMicrophone')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.MIC}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-notifications">
+ <settings-subpage
+ page-title="[[i18n('siteSettingsCategoryNotifications')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.NOTIFICATIONS}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <template is="dom-if" name="site-settings-category-popups">
+ <settings-subpage page-title="[[i18n('siteSettingsCategoryPopups')]]">
+ <site-settings-category
+ selected-site="{{selectedSite}}"
+ current-route="{{currentRoute}}"
+ category="{{ContentSettingsTypes.POPUPS}}">
+ </site-settings-category>
+ </settings-subpage>
+ </template>
+ <!-- TODO(michaelpg): confirm this is a bug, and switch to
+ settings-subpage (crbug.com/597314). -->
<neon-animatable id="site-details">
<site-details
site="{{selectedSite}}"
current-route="{{currentRoute}}">
</site-details>
- </neon-animatable>
+ </template>
Dan Beam 2016/03/30 03:44:27 wat
michaelpg 2016/03/30 22:48:03 good catch, done
</settings-animated-pages>
</template>
<script src="privacy_page.js"></script>
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.html ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | chrome/test/data/webui/settings/settings_page_browsertest.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698