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

Unified Diff: chrome/browser/resources/settings/settings_main/settings_main.js

Issue 2094223004: MD Settings: make chrome://[md-]settings/clearBrowserData URL work (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: asdf Created 4 years, 6 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/settings_main/settings_main.js
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.js b/chrome/browser/resources/settings/settings_main/settings_main.js
index 11cd9dd684eebba61b2ff7ec7ffed466e63f3575..f9afe10053f9bbe4649a97a3c3b9115cdebe440d 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.js
+++ b/chrome/browser/resources/settings/settings_main/settings_main.js
@@ -59,20 +59,36 @@ Polymer({
},
},
+ created: function() {
+ /** @private {!PromiseResolver} */
+ this.resolver_ = new PromiseResolver;
+ settings.main.rendered = this.resolver_.promise;
+ },
+
attached: function() {
document.addEventListener('toggle-advanced-page', function(e) {
this.showAdvancedPage_ = e.detail;
this.isAdvancedMenuOpen_ = e.detail;
if (this.showAdvancedPage_) {
- scrollWhenReady(
+ doWhenReady(
function() {
- return this.$$('settings-advanced-page');
+ var advancedPage = this.$$('settings-advanced-page');
+ return !!advancedPage && advancedPage.scrollHeight > 0;
}.bind(this),
function() {
- return this.$$('#toggleContainer');
+ this.$$('#toggleContainer').scrollIntoView();
}.bind(this));
}
}.bind(this));
+
+ doWhenReady(
+ function() {
+ var basicPage = this.$$('settings-basic-page');
+ return !!basicPage && basicPage.scrollHeight > 0;
+ }.bind(this),
+ function() {
+ this.resolver_.resolve();
+ }.bind(this));
},
/**

Powered by Google App Engine
This is Rietveld 408576698