| Index: chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| index 00b0dd17e1868f4b1d697082105af64e4ad9441d..96d3d8f4447d4bc7853775584fbbb20622ae1125 100644
|
| --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| @@ -28,17 +28,41 @@ Polymer({
|
| },
|
|
|
| /** @private */
|
| - showClearBrowsingDataDialog_: Boolean,
|
| + showClearBrowsingDataDialog_: {
|
| + computed: 'computeShowClearBrowsingDataDialog_(currentRoute)',
|
| + type: Boolean,
|
| + },
|
| },
|
|
|
| ready: function() {
|
| this.ContentSettingsTypes = settings.ContentSettingsTypes;
|
| },
|
|
|
| + /** @suppress {missingProperties} */
|
| + attached: function() {
|
| + if (this.showClearBrowsingDataDialog_) {
|
| + settings.main.rendered.then(function() {
|
| + var dialog = this.$$('settings-clear-browsing-data-dialog').$.dialog;
|
| + // TODO(dbeam): cast to a CrDialogElement when it compiles.
|
| + dialog.refit();
|
| + }.bind(this));
|
| + }
|
| + },
|
| +
|
| + /**
|
| + * @return {boolean} Whether the Clear Browsing Data dialog should be showing.
|
| + * @private
|
| + */
|
| + computeShowClearBrowsingDataDialog_: function() {
|
| + var route = this.currentRoute;
|
| + return route && route.subpage && route.subpage[0] == 'clear-browsing-data';
|
| + },
|
| +
|
| /** @private */
|
| onManageCertificatesTap_: function() {
|
| <if expr="use_nss_certs">
|
| - this.$.pages.setSubpageChain(['manage-certificates']);
|
| + var pages = /** @type {!SettingsAnimatedPagesElement} */(this.$.pages);
|
| + pages.setSubpageChain(['manage-certificates']);
|
| </if>
|
| <if expr="is_win or is_macosx">
|
| settings.PrivacyPageBrowserProxyImpl.getInstance().
|
| @@ -48,7 +72,8 @@ Polymer({
|
|
|
| /** @private */
|
| onSiteSettingsTap_: function() {
|
| - this.$.pages.setSubpageChain(['site-settings']);
|
| + var pages = /** @type {!SettingsAnimatedPagesElement} */(this.$.pages);
|
| + pages.setSubpageChain(['site-settings']);
|
| },
|
|
|
| /** @private */
|
|
|