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

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

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge Created 4 years, 4 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
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 78dca93609002442f83bfd9feb739910511ce46e..de004680b9adbc815987088c8c3c5344f9ec5a13 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -30,8 +30,7 @@
on-close="onDialogClosed_">
</settings-clear-browsing-data-dialog>
</template>
- <settings-animated-pages id="pages" current-route="{{currentRoute}}"
- section="privacy">
+ <settings-animated-pages id="pages" section="privacy">
<neon-animatable id="main">
<div class="settings-box block first">
<p class="privacy-explanation">
@@ -119,8 +118,7 @@
associated-control="[[$$('#site-settings-subpage-trigger')]]"
id="site-settings"
page-title="$i18n{siteSettings}">
- <settings-site-settings-page current-route="{{currentRoute}}"
- category-selected="{{categorySelected}}">
+ <settings-site-settings-page category-selected="{{categorySelected}}">
</settings-site-settings-page>
</settings-subpage>
</template>
@@ -128,10 +126,7 @@
<template is="dom-if" name="all-sites">
<settings-subpage no-associated-control
page-title="$i18n{siteSettingsCategoryAllSites}">
- <all-sites
- selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}">
- </all-sites>
+ <all-sites selected-site="{{selectedSite}}"></all-sites>
</settings-subpage>
</template>
<template is="dom-if" name="site-settings-category-automatic-downloads">
@@ -139,7 +134,6 @@
page-title="$i18n{siteSettingsAutomaticDownloads}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.AUTOMATIC_DOWNLOADS}}">
</site-settings-category>
</settings-subpage>
@@ -149,7 +143,6 @@
page-title="$i18n{siteSettingsBackgroundSync}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.BACKGROUND_SYNC}}">
</site-settings-category>
</settings-subpage>
@@ -159,7 +152,6 @@
page-title="$i18n{siteSettingsCategoryCamera}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.CAMERA}}">
<media-picker type="camera" class="media-picker"></media-picker>
</site-settings-category>
@@ -170,7 +162,6 @@
page-title="$i18n{siteSettingsCategoryCookies}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.COOKIES}}">
<div class="settings-box cookie-controls">
<settings-checkbox class="start"
@@ -188,7 +179,6 @@
page-title="$i18n{siteSettingsCategoryImages}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.IMAGES}}">
</site-settings-category>
</settings-subpage>
@@ -198,7 +188,6 @@
page-title="$i18n{siteSettingsCategoryLocation}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.GEOLOCATION}}">
</site-settings-category>
</settings-subpage>
@@ -214,7 +203,6 @@
page-title="$i18n{siteSettingsCategoryJavascript}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.JAVASCRIPT}}">
</site-settings-category>
</settings-subpage>
@@ -224,7 +212,6 @@
page-title="$i18n{siteSettingsKeygen}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.KEYGEN}}">
</site-settings-category>
</settings-subpage>
@@ -234,7 +221,6 @@
page-title="$i18n{siteSettingsCategoryMicrophone}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.MIC}}">
<media-picker type="mic" class="media-picker"></media-picker>
</site-settings-category>
@@ -245,7 +231,6 @@
page-title="$i18n{siteSettingsCategoryNotifications}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.NOTIFICATIONS}}">
</site-settings-category>
</settings-subpage>
@@ -255,7 +240,6 @@
page-title="$i18n{siteSettingsPlugins}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.PLUGINS}}">
</site-settings-category>
</settings-subpage>
@@ -265,7 +249,6 @@
page-title="$i18n{siteSettingsCategoryPopups}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.POPUPS}}">
</site-settings-category>
</settings-subpage>
@@ -275,7 +258,6 @@
page-title="$i18n{siteSettingsUnsandboxedPlugins}">
<site-settings-category
selected-site="{{selectedSite}}"
- current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}">
</site-settings-category>
</settings-subpage>

Powered by Google App Engine
This is Rietveld 408576698