| 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 705d2014a87fd036d9c6eb7315d2a30207bb010f..11cd9dd684eebba61b2ff7ec7ffed466e63f3575 100644
|
| --- a/chrome/browser/resources/settings/settings_main/settings_main.js
|
| +++ b/chrome/browser/resources/settings/settings_main/settings_main.js
|
| @@ -1,10 +1,6 @@
|
| // Copyright 2015 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| -
|
| -(function() {
|
| -
|
| -var resolver = new PromiseResolver();
|
|
|
| /**
|
| * @fileoverview
|
| @@ -68,25 +64,15 @@
|
| this.showAdvancedPage_ = e.detail;
|
| this.isAdvancedMenuOpen_ = e.detail;
|
| if (this.showAdvancedPage_) {
|
| - doWhenReady(
|
| + scrollWhenReady(
|
| function() {
|
| - var advancedPage = this.$$('settings-advanced-page');
|
| - return !!advancedPage && advancedPage.scrollHeight > 0;
|
| + return this.$$('settings-advanced-page');
|
| }.bind(this),
|
| function() {
|
| - this.$$('#toggleContainer').scrollIntoView();
|
| + return this.$$('#toggleContainer');
|
| }.bind(this));
|
| }
|
| }.bind(this));
|
| -
|
| - doWhenReady(
|
| - function() {
|
| - var basicPage = this.$$('settings-basic-page');
|
| - return !!basicPage && basicPage.scrollHeight > 0;
|
| - }.bind(this),
|
| - function() {
|
| - resolver.resolve();
|
| - });
|
| },
|
|
|
| /**
|
| @@ -123,9 +109,3 @@
|
| this.fire('toggle-advanced-page', !this.isAdvancedMenuOpen_);
|
| },
|
| });
|
| -
|
| -cr.define('settings.main', function() {
|
| - return {rendered: resolver.promise};
|
| -});
|
| -
|
| -})();
|
|
|