chrome/browser/resources/settings/settings_page/main_page_behavior.js - Issue 2185493003: MD Settings: Adding some unit tests for <settings-main>.

Unified Diff: chrome/browser/resources/settings/settings_page/main_page_behavior.js

Issue 2185493003: MD Settings: Adding some unit tests for <settings-main>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@search_no_results

Patch Set: Address comments. Created 4 years, 5 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

« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_main/settings_main.js ('k') | chrome/test/data/webui/settings/cr_settings_browsertest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_page/main_page_behavior.js

diff --git a/chrome/browser/resources/settings/settings_page/main_page_behavior.js b/chrome/browser/resources/settings/settings_page/main_page_behavior.js

index 852386f78c37e9ceec28fb565ba4fbb47228c13b..a9a3d1e81a27071a01fda7162818aea5cdd0fa51 100644

--- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js

+++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js

@@ -41,7 +41,10 @@ var MainPageBehaviorImpl = {

/** @override */

attached: function() {

- this.scroller = this.domHost && this.domHost.parentNode.$.mainContainer;

+ if (this.domHost && this.domHost.parentNode.tagName == 'PAPER-HEADER-PANEL')

michaelpg 2016/08/02 20:45:20 Would this.scroller = this.offsetParent work

dpapad 2016/08/02 22:33:15 I am reluctant of modifying behavior in this CL. M

michaelpg 2016/08/03 18:54:50 Fair points, thank you!

+ this.scroller = this.domHost.parentNode.$.mainContainer;

+ else

+ this.scroller = document.body; // Used in unit tests.

/**