Split OptionsPage into Page and PageManager

chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js

Index: chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js
diff --git a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js
index 5f017c8e93234c90801fbadb2b10f543db4486ab..e77207de9c4c4232b928932be11aa94134014680 100644
--- a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js
+++ b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.js
@@ -3,7 +3,8 @@
 // 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
@@ -11,22 +12,22 @@ cr.define('options', function() {
    * @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();
     },
 
     /**
@@ -126,7 +127,7 @@ cr.define('options', function() {
         loadTimeData.getStringF('certificateEditCaTrustDescriptionFormat',
                                 certName);
     self.enableInputs_(false);
-    OptionsPage.navigateToPage('certificateEditCaTrustOverlay');
+    PageManager.showPageByName('certificateEditCaTrustOverlay');
     chrome.send('getCaCertificateTrust', [certId]);
   }
 
@@ -150,7 +151,7 @@ cr.define('options', function() {
         loadTimeData.getStringF('certificateImportCaDescriptionFormat',
                                 certName);
     CertificateEditCaTrustOverlay.populateTrust(false, false, false);
-    OptionsPage.navigateToPage('certificateEditCaTrustOverlay');
+    PageManager.showPageByName('certificateEditCaTrustOverlay');
   }
 
   CertificateEditCaTrustOverlay.dismiss = function() {