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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Resolve conflicts with ToT. Created 4 years, 4 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

« no previous file with comments | « 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')

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

+ else

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

/**