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

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

Issue 2507873002: MD Settings search code will not assume the Advanced section exists. (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 35cb61094006288cd47ada3441ba0ae85e23d74c..4dc1ae05c2459c72b44875442ed967318cd67741 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.js
+++ b/chrome/browser/resources/settings/settings_main/settings_main.js
@@ -330,10 +330,11 @@ Polymer({
setTimeout(function() {
var whenSearchDone = settings.getSearchManager().search(
query, assert(this.getPage_(settings.Route.BASIC)));
- assert(
- whenSearchDone ===
- settings.getSearchManager().search(
- query, assert(this.getPage_(settings.Route.ADVANCED))));
+
+ if (cr.isChromeOS || !loadTimeData.getBoolean('isGuest')) {
michaelpg 2016/11/16 20:10:14 Please use: if (this.pageVisibility.showAdvanced
michaelpg 2016/11/16 20:12:31 Also because we mess with pageVisibility in tests
hcarmona 2016/11/16 20:23:08 Done.
+ assert(whenSearchDone === settings.getSearchManager().search(
+ query, assert(this.getPage_(settings.Route.ADVANCED))));
+ }
whenSearchDone.then(function(request) {
resolve();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698