Split OptionsPage into Page and PageManager

chrome/browser/resources/options/alert_overlay.js

 // Copyright (c) 2012 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() {
-  var OptionsPage = options.OptionsPage;
+  var Page = cr.ui.pageManager.Page;
+  var PageManager = cr.ui.pageManager.PageManager;
 
   /**
    * AlertOverlay class
    * Encapsulated handling of a generic alert.
    * @class
    */
   function AlertOverlay() {
-    OptionsPage.call(this, 'alertOverlay', '', 'alertOverlay');
+    // AlertOverlay is special in that it is not tied to one page or overlay.
+    // Set the nesting level arbitrarily high so as to always be recognized as
+    // the top-most visible page.
+    Page.call(this, 'alertOverlay', '', 'alertOverlay', 99);
   }
 
   cr.addSingletonGetter(AlertOverlay);
 
   AlertOverlay.prototype = {
-    // Inherit AlertOverlay from OptionsPage.
-    __proto__: OptionsPage.prototype,
+    // Inherit AlertOverlay from Page.
+    __proto__: Page.prototype,
 
     /**
      * Whether the page can be shown. Used to make sure the page is only
      * shown via AlertOverlay.Show(), and not via the address bar.
      * @private
      */
     canShow_: false,
 
     /**
      * Initialize the page.
      */
     initializePage: function() {
-      // Call base class implementation to start preference initialization.
-      OptionsPage.prototype.initializePage.call(this);
+      Page.prototype.initializePage.call(this);
 
       var self = this;
       $('alertOverlayOk').onclick = function(event) {
         self.handleOK_();
       };
 
       $('alertOverlayCancel').onclick = function(event) {
         self.handleCancel_();
       };
     },
 
-    /** @override */
-    get nestingLevel() {
-      // AlertOverlay is special in that it is not tied to one page or overlay.
-      // Set the nesting level arbitrarily high so as to always be recognized as
-      // the top-most visible page.
-      return 99;
-    },
-
     /**
      * Handle the 'ok' button.  Clear the overlay and call the ok callback if
      * available.
      * @private
      */
     handleOK_: function() {
-      OptionsPage.closeOverlay();
+      PageManager.closeOverlay();
       if (this.okCallback != undefined) {

[Dan Beam, 2014/07/30 01:00:01]

opt nit: no curlies, no comparison to undefined

[michaelpg, 2014/07/30 21:42:19]

would rather not touch this, the CL is big enough already

         this.okCallback.call();
       }
     },
 
     /**
      * Handle the 'cancel' button.  Clear the overlay and call the cancel
      * callback if available.
      * @private
      */
     handleCancel_: function() {
-      OptionsPage.closeOverlay();
+      PageManager.closeOverlay();
       if (this.cancelCallback != undefined) {
         this.cancelCallback.call();
       }
     },
 
     /**
      * The page is getting hidden. Don't let it be shown again.
      */
     willHidePage: function() {
       canShow_ = false;
@@ skipping 51 matching lines @@
       $('alertOverlayCancel').style.display = 'none';
     }
 
     var alertOverlay = AlertOverlay.getInstance();
     alertOverlay.okCallback = okCallback;
     alertOverlay.cancelCallback = cancelCallback;
     alertOverlay.canShow_ = true;
 
     // Intentionally don't show the URL in the location bar as we don't want
     // people trying to navigate here by hand.
-    OptionsPage.showPageByName('alertOverlay', false);
+    PageManager.showPageByName('alertOverlay', false);
   };
 
   // Export
   return {
     AlertOverlay: AlertOverlay
   };
 });