Split OptionsPage into Page and PageManager

chrome/browser/resources/options/content_settings.js

Index: chrome/browser/resources/options/content_settings.js
diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index c95bcf76dadf4d449d0ea091caa6fd044fc1c732..d7562d6432b931f8c58dabaf1c3618d14e91ac73 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.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;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
@@ -14,18 +15,18 @@ cr.define('options', function() {
    */
   function ContentSettings() {
     this.activeNavTab = null;
-    OptionsPage.call(this, 'content',
-                     loadTimeData.getString('contentSettingsPageTabTitle'),
-                     'content-settings-page');
+    Page.call(this, 'content',
+              loadTimeData.getString('contentSettingsPageTabTitle'),
+              'content-settings-page');
   }
 
   cr.addSingletonGetter(ContentSettings);
 
   ContentSettings.prototype = {
-    __proto__: OptionsPage.prototype,
+    __proto__: Page.prototype,
 
     initializePage: function() {
-      OptionsPage.prototype.initializePage.call(this);
+      Page.prototype.initializePage.call(this);
 
       var exceptionsButtons =
           this.pageDiv.querySelectorAll('.exceptions-list-button');
@@ -41,14 +42,14 @@ cr.define('options', function() {
 
           // Navigate after the local history has been replaced in order to have
           // the correct hash loaded.
-          OptionsPage.showPageByName('contentExceptions', false);
+          PageManager.showPageByName('contentExceptions', false);
         };
       }
 
       var manageHandlersButton = $('manage-handlers-button');
       if (manageHandlersButton) {
         manageHandlersButton.onclick = function(event) {
-          OptionsPage.navigateToPage('handlers');
+          PageManager.showPageByName('handlers');
         };
       }
 
@@ -63,11 +64,11 @@ cr.define('options', function() {
       // Cookies filter page ---------------------------------------------------
       $('show-cookies-button').onclick = function(event) {
         chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
-        OptionsPage.navigateToPage('cookies');
+        PageManager.showPageByName('cookies');
       };
 
       $('content-settings-overlay-confirm').onclick =
-          OptionsPage.closeOverlay.bind(OptionsPage);
+          PageManager.closeOverlay.bind(PageManager);
 
       $('media-pepper-flash-default').hidden = true;
       $('media-pepper-flash-exceptions').hidden = true;
@@ -144,7 +145,7 @@ cr.define('options', function() {
     if (mediaSettings.cameraDisabled)
       $('media-select-camera').disabled = true;
 
-    OptionsPage.hideBubble();
+    PageManager.hideBubble();
     // Create a synthetic pref change event decorated as
     // CoreOptionsHandler::CreateValueForPref() does.
     // TODO(arv): It was not clear what event type this should use?