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

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: Nit. 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
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 933a0ec4baab3a6cd5c57404141fed70b549de6c..03fb03735ade072b0828ce4297a715a22258a0de 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.
michaelpg 2016/07/30 05:38:44 could this just be assert(this.parentElement)? if
michaelpg 2016/08/02 20:45:20 or better, see my new suggestion
dpapad 2016/08/02 22:33:15 Previous suggestion does not work. this.parentElem
},
/**

Powered by Google App Engine
This is Rietveld 408576698