chrome/browser/resources/settings/privacy_page/privacy_page.html - Issue 1863623002: Convert Site Details to settings-subpage.

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

Issue 1863623002: Convert Site Details to settings-subpage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge Created 4 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 | « no previous file | chrome/browser/resources/settings/site_settings/site_details.css » ('j') | chrome/browser/resources/settings/site_settings/site_details_permission.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

2 <link rel="import" href="chrome://resources/html/polymer.html">	2 <link rel="import" href="chrome://resources/html/polymer.html">

3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">

6 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html">	6 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html">

7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">	7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">

8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">	8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">

9 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l">	9 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l">

10 <link rel="import" href="chrome://md-settings/settings_shared_css.html">	10 <link rel="import" href="chrome://md-settings/settings_shared_css.html">

(...skipping 197 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
208 <template is="dom-if" name="site-settings-category-popups">	208 <template is="dom-if" name="site-settings-category-popups">

209 <settings-subpage page-title="[[i18n('siteSettingsCategoryPopups')]]">	209 <settings-subpage page-title="[[i18n('siteSettingsCategoryPopups')]]">

210 <site-settings-category	210 <site-settings-category

211 selected-site="{{selectedSite}}"	211 selected-site="{{selectedSite}}"

212 current-route="{{currentRoute}}"	212 current-route="{{currentRoute}}"

213 category="{{ContentSettingsTypes.POPUPS}}">	213 category="{{ContentSettingsTypes.POPUPS}}">

214 </site-settings-category>	214 </site-settings-category>

215 </settings-subpage>	215 </settings-subpage>

216 </template>	216 </template>

217	217

218 <!-- TODO(finnur): switch to settings-subpage (crbug.com/597314). -->	218 <template is="dom-if" name="site-details">

219 <neon-animatable id="site-details">	219 <settings-subpage

220 <site-details	220 page-title="[[i18n('siteSettingsSiteDetailsPageTitle')]]">

221 site="{{selectedSite}}"	221 <site-details

222 current-route="{{currentRoute}}">	222 site="{{selectedSite}}"
	michaelpg 2016/04/05 18:22:53 nit: while you're here, since this isn't "notify: nit: while you're here, since this isn't "notify: true", make it explicitly 1-way bound: site="[[selectedSite]]" Finnur 2016/04/06 00:25:19 Good idea. Good idea.
223 </site-details>	223 current-route="{{currentRoute}}">
	michaelpg 2016/04/05 18:22:53 is currentRoute used by site-details? is currentRoute used by site-details? Finnur 2016/04/06 00:25:19 Hmm... Good catch. Hmm... Good catch.
224 </neon-animatable>	224 </site-details>

	225 </settings-subpage>

	226 </template>

225 </settings-animated-pages>	227 </settings-animated-pages>

226 </template>	228 </template>

227 <script src="privacy_page.js"></script>	229 <script src="privacy_page.js"></script>

228 </dom-module>	230 </dom-module>

OLD	NEW