Split OptionsPage into Page and PageManager

chrome/browser/resources/options/chromeos/change_picture_options.js

Index: chrome/browser/resources/options/chromeos/change_picture_options.js
diff --git a/chrome/browser/resources/options/chromeos/change_picture_options.js b/chrome/browser/resources/options/chromeos/change_picture_options.js
index 93982ea69c353beaba9115269268c9d857d80022..c0bb80bd048c8b9776d22a4f1082b74880a2a63b 100644
--- a/chrome/browser/resources/options/chromeos/change_picture_options.js
+++ b/chrome/browser/resources/options/chromeos/change_picture_options.js
@@ -4,7 +4,8 @@
 
 cr.define('options', function() {
 

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

nit: remove \n

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

Done.

-  var OptionsPage = options.OptionsPage;
+  var Page = cr.ui.pageManager.Page;
+  var PageManager = cr.ui.pageManager.PageManager;
   var UserImagesGrid = options.UserImagesGrid;
   var ButtonImages = UserImagesGrid.ButtonImages;
 
@@ -26,25 +27,23 @@ cr.define('options', function() {
    * @constructor
    */
   function ChangePictureOptions() {
-    OptionsPage.call(
-        this,
-        'changePicture',
-        loadTimeData.getString('changePicturePage'),
-        'change-picture-page');
+    Page.call(this,
+              'changePicture',
+              loadTimeData.getString('changePicturePage'),
+              'change-picture-page');
   }
 
   cr.addSingletonGetter(ChangePictureOptions);
 
   ChangePictureOptions.prototype = {
-    // Inherit ChangePictureOptions from OptionsPage.
-    __proto__: options.OptionsPage.prototype,
+    // Inherit ChangePictureOptions from Page.
+    __proto__: Page.prototype,
 
     /**
      * Initializes ChangePictureOptions page.
      */
     initializePage: function() {
-      // Call base class implementation to start preferences initialization.
-      OptionsPage.prototype.initializePage.call(this);
+      Page.prototype.initializePage.call(this);
 
       var imageGrid = $('user-image-grid');
       UserImagesGrid.decorate(imageGrid);
@@ -148,7 +147,7 @@ cr.define('options', function() {
      */
     closeOverlay_: function() {
       if (!$('change-picture-page').hidden)
-        OptionsPage.closeOverlay();
+        PageManager.closeOverlay();
     },
 
     /**