Split OptionsPage into Page and PageManager

chrome/browser/resources/options/chromeos/change_picture_options.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() {
 

[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;
 
   /**
    * Array of button URLs used on this page.
    * @type {Array.<string>}
    * @const
    */
   var ButtonImageUrls = [
     ButtonImages.TAKE_PHOTO,
     ButtonImages.CHOOSE_FILE
   ];
 
   /////////////////////////////////////////////////////////////////////////////
   // ChangePictureOptions class:
 
   /**
    * Encapsulated handling of ChromeOS change picture options page.
    * @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);
 
       // Preview image will track the selected item's URL.
       var previewElement = $('user-image-preview');
       previewElement.oncontextmenu = function(e) { e.preventDefault(); };
 
       imageGrid.previewElement = previewElement;
       imageGrid.selectionType = 'default';
@@ skipping 83 matching lines @@
     didClosePage: function() {
       this.willHidePage();
     },
 
     /**
      * Closes the overlay, returning to the main settings page.
      * @private
      */
     closeOverlay_: function() {
       if (!$('change-picture-page').hidden)
-        OptionsPage.closeOverlay();
+        PageManager.closeOverlay();
     },
 
     /**
      * Handle camera-photo flip.
      */
     handleFlipPhoto_: function() {
       var imageGrid = $('user-image-grid');
       imageGrid.previewElement.classList.add('animation');
       imageGrid.flipPhoto = !imageGrid.flipPhoto;
       var flipMessageId = imageGrid.flipPhoto ?
@@ skipping 179 matching lines @@
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ChangePictureOptions: ChangePictureOptions
   };
 
 });