Split OptionsPage into Page and PageManager

chrome/browser/resources/options/certificate_edit_ca_trust_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() {
-  /** @const */ var OptionsPage = options.OptionsPage;
+  /** @const */ var Page = cr.ui.pageManager.Page;
+  /** @const */ var PageManager = cr.ui.pageManager.PageManager;
 
   /**
    * CertificateEditCaTrustOverlay class
    * Encapsulated handling of the 'edit ca trust' and 'import ca' overlay pages.
    * @class
    */
   function CertificateEditCaTrustOverlay() {
-    OptionsPage.call(this, 'certificateEditCaTrustOverlay',
-                     '',
-                     'certificateEditCaTrustOverlay');
+    Page.call(this, 'certificateEditCaTrustOverlay',
+              '',
+              'certificateEditCaTrustOverlay');

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

nit: this super call (and many others) could be less vertical lines

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

Done, for most if not all of these calls.

   }
 
   cr.addSingletonGetter(CertificateEditCaTrustOverlay);
 
   CertificateEditCaTrustOverlay.prototype = {
-    __proto__: OptionsPage.prototype,
+    __proto__: Page.prototype,
 
     /**
      * Dismisses the overlay.
      * @private
      */
     dismissOverlay_: function() {
-      OptionsPage.closeOverlay();
+      PageManager.closeOverlay();
     },
 
     /**
      * Enables or disables input fields.
      * @private
      */
     enableInputs_: function(enabled) {
       $('certificateCaTrustSSLCheckbox').disabled =
       $('certificateCaTrustEmailCheckbox').disabled =
       $('certificateCaTrustObjSignCheckbox').disabled =
@@ skipping 79 matching lines @@
     $('certificateEditCaTrustCancelButton').onclick = function(event) {
       self.cancelEdit_();
     }
     $('certificateEditCaTrustOkButton').onclick = function(event) {
       self.finishEdit_();
     }
     $('certificateEditCaTrustDescription').textContent =
         loadTimeData.getStringF('certificateEditCaTrustDescriptionFormat',
                                 certName);
     self.enableInputs_(false);
-    OptionsPage.navigateToPage('certificateEditCaTrustOverlay');
+    PageManager.showPageByName('certificateEditCaTrustOverlay');
     chrome.send('getCaCertificateTrust', [certId]);
   }
 
   /**
    * Show the Import CA overlay.
    * @param {string} certId The id of the certificate to be passed to the
    * certificate manager model.
    * @param {string} certName The display name of the certificate.
    * checkbox.
    */
   CertificateEditCaTrustOverlay.showImport = function(certName) {
     var self = CertificateEditCaTrustOverlay.getInstance();
     // TODO(mattm): do we want a view certificate button here like firefox has?
     $('certificateEditCaTrustCancelButton').onclick = function(event) {
       self.cancelImport_();
     }
     $('certificateEditCaTrustOkButton').onclick = function(event) {
       self.finishImport_();
     }
     $('certificateEditCaTrustDescription').textContent =
         loadTimeData.getStringF('certificateImportCaDescriptionFormat',
                                 certName);
     CertificateEditCaTrustOverlay.populateTrust(false, false, false);
-    OptionsPage.navigateToPage('certificateEditCaTrustOverlay');
+    PageManager.showPageByName('certificateEditCaTrustOverlay');
   }
 
   CertificateEditCaTrustOverlay.dismiss = function() {
     CertificateEditCaTrustOverlay.getInstance().dismissOverlay_();
   };
 
   // Export
   return {
     CertificateEditCaTrustOverlay: CertificateEditCaTrustOverlay
   };
 });