Guest mode page visibility patch set 11, minus dom.flush(), w/ overscroll fix

chrome/browser/resources/settings/settings_main/settings_main.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'settings-main' displays the selected settings page.
  */
 Polymer({
   is: 'settings-main',
@@ skipping 42 matching lines @@
     showNoResultsFound_: {
       type: Boolean,
       value: false,
     },
 
     toolbarSpinnerActive: {
       type: Boolean,
       value: false,
       notify: true,
     },
+
+    /**
+     * Dictionary defining page visibility.
+     * @type {!GuestModePageVisibility}
+     */
+    pageVisibility: {
+      type: Object,
+      value: function() { return {}; },
+    },
   },
 
   /** @override */
   created: function() {
     /** @private {!PromiseResolver} */
     this.resolver_ = new PromiseResolver;
     settings.main.rendered = this.resolver_.promise;
   },
 
   /** @override */
@@ skipping 23 matching lines @@
    * @private
    */
   arrowState_: function(opened) {
     return opened ? 'settings:arrow-drop-up' : 'cr:arrow-drop-down';
   },
 
   /**
    * @param {boolean} showBasicPage
    * @param {boolean} inSubpage
    * @return {boolean}
+   * @private
    */
   showAdvancedToggle_: function(showBasicPage, inSubpage) {
     return showBasicPage && !inSubpage;
   },
 
   /**
    * @param {!SettingsRoute} newRoute
    * @private
    */
   currentRouteChanged_: function(newRoute) {
     this.inSubpage_ = newRoute.subpage.length > 0;
     this.style.height = this.inSubpage_ ? '100%' : '';
 
     if (newRoute.page == 'about') {
       this.showPages_ = {about: true, basic: false, advanced: false};
     } else {
       this.showPages_ = {
         about: false,
         basic: newRoute.page == 'basic' || !this.inSubpage_,
         advanced: newRoute.page == 'advanced' ||
             (!this.inSubpage_ && this.advancedToggleExpanded_),
       };
 
-      if (this.showPages_.advanced)
+      if (this.showPages_.advanced) {
+        assert(!this.pageVisibility ||
+            this.pageVisibility.advancedSettings !== false);
         this.advancedToggleExpanded_ = true;
+      }
     }
 
     // Wait for the dom-if changes prior to calculating the overflow padding.
     this.async(function() {
       this.$.overscroll.style.paddingBottom = this.overscrollHeight_() + 'px';
     });
   },
 
   /**
    * Return the height that the over scroll padding should be set to.
    * This is used to determine how much padding to apply to the end of the
    * content so that the last element may align with the top of the content
    * area.
    * @return {number}
    * @private
    */
   overscrollHeight_: function() {
     if (!this.currentRoute || this.currentRoute.subpage.length != 0 ||
         this.showPages_.about) {
       return 0;
     }
 
+    // Ensure any dom-if reflects the current properties.
+    Polymer.dom.flush();
+
     /**
      * @param {!Element} element
      * @return {number}
      */
     var calcHeight = function(element) {
       var style = getComputedStyle(element);
       var height = this.parentNode.scrollHeight - element.offsetHeight +
           parseFloat(style.marginTop) + parseFloat(style.marginBottom);
       assert(height >= 0);
       return height;
     }.bind(this);
 
     if (this.showPages_.advanced) {
       var lastSection = this.$$('settings-advanced-page').$$(
           'settings-section:last-of-type');
       // |lastSection| may be null in unit tests.
       if (!lastSection)
         return 0;
       return calcHeight(lastSection);
     }
 
     assert(this.showPages_.basic);
     var lastSection = this.$$('settings-basic-page').$$(
         'settings-section:last-of-type');
     // |lastSection| may be null in unit tests.
     if (!lastSection)
       return 0;
-    return calcHeight(lastSection) - this.$$('#toggleContainer').offsetHeight;
+    var toggleContainer = this.$$('#toggleContainer');
+    return calcHeight(lastSection) -
+        (toggleContainer ? toggleContainer.offsetHeight : 0);
   },
 
   /** @private */
   toggleAdvancedPage_: function() {
     this.fire('toggle-advanced-page', !this.advancedToggleExpanded_);
   },
 
   /**
    * Navigates to the default search page (if necessary).
    * @private
@@ skipping 30 matching lines @@
               // completed.
               return;
             }
 
             this.toolbarSpinnerActive = false;
             this.showNoResultsFound_ =
                 !request.isSame('') && !request.didFindMatches();
           }.bind(this));
     }.bind(this), 0);
   },
+
+  /**
+   * @param {(boolean|undefined)} visibility
+   * @return {boolean} True unless visibility is false.
+   * @private
+   */
+  showAdvancedSettings_: function(visibility) {
+    return visibility !== false;
+  },
 });