MD Settings: cr/cros - Guest mode page visibility

chrome/browser/resources/settings/settings_main/settings_main.html

Index: chrome/browser/resources/settings/settings_main/settings_main.html
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index 990c85c6c2e61ce39e1eca9a1468443339875ca0..8cf897277036ccabff15ff13e18a4f4add79f248 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -39,22 +39,25 @@
     </style>
     <content select="paper-icon-button"></content>
     <template is="dom-if" if="[[showBasicPage_]]">
-      <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}">
+      <settings-basic-page prefs="{{prefs}}" current-route="{{currentRoute}}"
+          page-visibility="[[pageVisibility]]">
       </settings-basic-page>
     </template>
-    <template is="dom-if" if="[[showAdvancedToggle_]]">
-      <div id="toggleSpacer"></div>
-      <div id="toggleContainer">
-        <div id="advancedToggle" on-tap="toggleAdvancedPage_">
-          <span>$i18n{advancedPageTitle}</span>
-          <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>
+    <template is="dom-if" if="[[!pageVisibility.hideAdvancedSettings]]">

[michaelpg, 2016/07/13 00:01:35]

Please address this in currentRouteChanged_ instead of creating a new dom-if.
The logic there needs some more work to integrate this.

[Moe, 2016/07/13 20:17:17]

I did initially handle this in the observer (it needs to observe currentRoute as
well as pageVisibility). It adds more obscurity to the already
difficult-to-follow logic there. This is a lot cleaner IMO. Unless you really
want me to do it that way :)

[michaelpg, 2016/07/14 00:31:28]

Meh. It's inherently illogical that (!hideAdvancedSettings) doesn't imply
(showAdvancedPage_). But I'll be changing these to computed properties sooner or
later anyway, so that should simplify things.

[Moe, 2016/07/14 17:19:55]

+1 for computed properties.

[michaelpg, 2016/07/21 21:58:44]

FYI, unfortunately computed properties ended up being painful too, because we
now want to adjust these manually when searching the page.

I have a CL that simplifies currentRouteChanged_ a bit, maybe I'll go back and
do this later, the dom-if's are okay for now though.
https://codereview.chromium.org/2160713002/

+      <template is="dom-if" if="[[showAdvancedToggle_]]">
+        <div id="toggleSpacer"></div>
+        <div id="toggleContainer">
+          <div id="advancedToggle" on-tap="toggleAdvancedPage_">
+            <span>$i18n{advancedPageTitle}</span>
+            <iron-icon icon="[[arrowState_(showAdvancedPage_)]]"></iron-icon>
+          </div>
         </div>
-      </div>
-    </template>
-    <template is="dom-if" if="[[showAdvancedPage_]]">
-      <settings-advanced-page prefs="{{prefs}}"
-          current-route="{{currentRoute}}">
-      </settings-advanced-page>
+      </template>
+      <template is="dom-if" if="[[showAdvancedPage_]]">
+        <settings-advanced-page prefs="{{prefs}}" current-route="{{currentRoute}}"
+            page-visibility="[[pageVisibility]]">
+        </settings-advanced-page>
+      </template>
     </template>
     <template is="dom-if" if="[[showAboutPage_]]">
       <settings-about-page current-route="{{currentRoute}}">