[cros] Change Picture prefs page: DOM initialization moved to separate handler from Initialize.

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

 // Copyright (c) 2011 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() {
 
   var OptionsPage = options.OptionsPage;
   var UserImagesGrid = options.UserImagesGrid;
   var ButtonImages = UserImagesGrid.ButtonImages;
 
@@ skipping 54 matching lines @@
                         localStrings.getString('chooseFile'),
                         this.handleChooseFile_.bind(this));
 
       // Profile image data.
       this.profileImage_ = imageGrid.addItem(
           ButtonImages.PROFILE_PICTURE,
           localStrings.getString('profilePhotoLoading'));
 
       // Old user image data (if present).
       this.oldImage_ = null;
+
+      chrome.send('onChangePicturePageInitialized');
     },
 
     /**
      * Called right after the page has been shown to user.
      */
     didShowPage: function() {
       $('images-grid').updateAndFocus();
-      chrome.send('onPageShown');
+      chrome.send('onChangePicturePageShown');
     },
 
     /**
      * Called right before the page is hidden.
      */
     willHidePage: function() {
+      var imageGrid = $('images-grid');
+      imageGrid.blur();  // Make sure the image grid is not active.
       if (this.oldImage_) {
-        $('images-grid').removeItem(this.oldImage_);
+        imageGrid.removeItem(this.oldImage_);
         this.oldImage_ = null;
       }
     },
 
     /**
      * Closes current page, returning back to Personal Stuff page.
      * @private
      */
     closePage_: function() {
-      $('images-grid').blur();  // Make sure the image grid is not active.
       OptionsPage.navigateToPage('personal');
     },
 
     /**
      * Handles "Take photo" button activation.
      * @private
      */
     handleTakePhoto_: function() {
       chrome.send('takePhoto');
       this.closePage_();
@@ skipping 101 matching lines @@
     /**
      * Selects user image with the given URL.
      * @param {string} url URL of the image to select.
      * @private
      */
     setSelectedImage_: function(url) {
       $('images-grid').selectedItemUrl = url;
     },
 
     /**
-     * Appends received images to the image grid.
-     * @param {Array.<string>} images An array of URLs to user images.
+     * Appends default images to the image grid. Should only be called once.
+     * @param {Array.<string>} images An array of URLs to default images.
      * @private
      */
-    setUserImages_: function(images) {
+    setDefaultImages_: function(images) {
       var imageGrid = $('images-grid');
       for (var i = 0, url; url = images[i]; i++) {
         imageGrid.addItem(url);
       }
     },
   };
 
   // Forward public APIs to private implementations.
   [
     'setCameraPresent',
+    'setDefaultImages',
     'setOldImage',
     'setProfileImage',
     'setSelectedImage',
-    'setUserImages',
   ].forEach(function(name) {
     ChangePictureOptions[name] = function(value1, value2) {
       ChangePictureOptions.getInstance()[name + '_'](value1, value2);
     };
   });
 
   // Export
   return {
     ChangePictureOptions: ChangePictureOptions
   };
 
 });