Sync: Refactor the ProfileSyncService and sync setup flow to remove use of WebUI from PSS.

chrome/browser/resources/options/options_page.js

 // Copyright (c) 2011 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.
 
 cr.define('options', function() {
   /////////////////////////////////////////////////////////////////////////////
   // OptionsPage class:
 
   /**
    * Base class for options page.
@@ skipping 100 matching lines @@
     // Notify pages if they will be hidden.
     for (var name in this.registeredPages) {
       var page = this.registeredPages[name];
       if (!page.parentPage && isRootPageLocked)
         continue;
       if (page.willHidePage && name != pageName &&
           !page.isAncestorOfPage(targetPage))
         page.willHidePage();
     }
 
+    var prevVisible = false;
+
     // Update visibilities to show only the hierarchy of the target page.
     for (var name in this.registeredPages) {
       var page = this.registeredPages[name];
       if (!page.parentPage && isRootPageLocked)
         continue;
+      prevVisible = page.visible;
       page.visible = name == pageName ||
           (!document.documentElement.classList.contains('hide-menu') &&
            page.isAncestorOfPage(targetPage));
     }
 
     // Update the history and current location.
     if (updateHistory)
       this.updateHistoryState_();
 
     // Always update the page title.
     document.title = targetPage.title;
 
     // Notify pages if they were shown.
     for (var name in this.registeredPages) {
       var page = this.registeredPages[name];
       if (!page.parentPage && isRootPageLocked)
         continue;
-      if (page.didShowPage && (name == pageName ||
+      if (!prevVisible && page.didShowPage && (name == pageName ||
           page.isAncestorOfPage(targetPage)))
         page.didShowPage();
     }
   };
 
   /**
    * Updates the visibility and stacking order of the subpage backdrop
    * according to which subpage is topmost and visible.
    * @private
    */
@@ skipping 46 matching lines @@
    * @return {boolean} whether we showed an overlay.
    */
   OptionsPage.showOverlay_ = function(overlayName, rootPage) {
     var overlay = this.registeredOverlayPages[overlayName.toLowerCase()];
     if (!overlay || !overlay.canShowPage())
       return false;
 
     if ((!rootPage || !rootPage.sticky) && overlay.parentPage)
       this.showPageByName(overlay.parentPage.name, false);
 
-    overlay.visible = true;
-    if (overlay.didShowPage) overlay.didShowPage();
+    if (!overlay.visible) {
+      overlay.visible = true;
+      if (overlay.didShowPage) overlay.didShowPage();
+    }
+
     return true;
   };
 
   /**
    * Returns whether or not an overlay is visible.
    * @return {boolean} True if an overlay is visible.
    * @private
    */
   OptionsPage.isOverlayVisible_ = function() {
     return this.getVisibleOverlay_() != null;
   };
 
   /**
-   * @return {boolean} True if the visible overlay should be closed.
-   * @private
-   */
-  OptionsPage.shouldCloseOverlay_ = function() {
-    var overlay = this.getVisibleOverlay_();
-    return overlay && overlay.shouldClose();
-  };
-
-  /**
    * Returns the currently visible overlay, or null if no page is visible.
    * @return {OptionPage} The visible overlay.
    */
   OptionsPage.getVisibleOverlay_ = function() {
     for (var name in this.registeredOverlayPages) {
       var page = this.registeredOverlayPages[name];
       if (page.visible)
         return page;
     }
     return null;
@@ skipping 495 matching lines @@
   };
 
   /**
    * A function to handle key press events.
    * @return {Event} a keydown event.
    * @private
    */
   OptionsPage.keyDownEventHandler_ = function(event) {
     // Close the top overlay or sub-page on esc.
     if (event.keyCode == 27) {  // Esc
-      if (this.isOverlayVisible_()) {
-        if (this.shouldCloseOverlay_())
-          this.closeOverlay();
-      } else {
+      if (this.isOverlayVisible_())
+        this.closeOverlay();
+      else
         this.closeTopSubPage_();
-      }
     }
   };
 
   OptionsPage.setClearPluginLSODataEnabled = function(enabled) {
     if (enabled) {
       document.documentElement.setAttribute(
           'flashPluginSupportsClearSiteData', '');
     } else {
       document.documentElement.removeAttribute(
           'flashPluginSupportsClearSiteData');
@@ skipping 236 matching lines @@
       return false;
     },
 
     /**
      * Whether it should be possible to show the page.
      * @return {boolean} True if the page should be shown
      */
     canShowPage: function() {
       return true;
     },
-
-    /**
-     * Whether an overlay should be closed. Used by overlay implementation to
-     * handle special closing behaviors.
-     * @return {boolean} True if the overlay should be closed.
-     */
-    shouldClose: function() {
-      return true;
-    },
   };
 
   // Export
   return {
     OptionsPage: OptionsPage
   };
 });