[cros] OOBE avatar picker fixes and polishing.

*) Profile image spinner visible again.
*) Camera snapshot can no longer be taken while initializing.

BUG=141274

Review URL: https://chromiumcodereview.appspot.com/10825319

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151281 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/chromeos/login/oobe_screen_user_image.js

@@ -286,7 +286,6 @@ cr.define('oobe', function() {
     },
 
     /**
-<<<<<<< HEAD
      * Appends default images to the image grid. Should only be called once.
      * @param {Array.<{url: string, author: string, website: string,
      *     title: string}>} images An array of default images data,
@@ -376,6 +375,7 @@ cr.define('oobe', function() {
             el.id = 'profile-image';
           });
       this.profileImage_.type = 'profile';
+      this.profileImageLoading = true;
 
       // Add camera stream element.
       imageGrid.cameraImage = null;

chrome/browser/resources/chromeos/user_images_grid.js

@@ -188,7 +188,8 @@ cr.define('options', function() {
     },
 
     /**
-     * @param {boolean} present Whether a camera is present or not.
+     * Whether a camera is present or not.
+     * @type {boolean}
      */
     get cameraPresent() {
       return this.cameraPresent_;
@@ -199,6 +200,15 @@ cr.define('options', function() {
         this.cameraImage = null;
     },
 
+    /**
+     * Whether camera is actually streaming video. May be |false| even when
+     * camera is present and shown but still initializing.
+     * @type {boolean}
+     */
+    get cameraOnline() {
+      return this.previewElement.classList.contains('online');
+    },
+
     /**
      * Start camera presence check.
      * @param {boolean} autoplay Whether to start capture immediately.
@@ -439,8 +449,11 @@ cr.define('options', function() {
      * Performs photo capture from the live camera stream.
      * @param {function=} opt_callback Callback that receives taken photo as
      *     data URL.
+     * @return {boolean} Whether photo capture was successful.
      */
     takePhoto: function(opt_callback) {
+      if (!this.cameraOnline)
+        return false;
       var canvas = document.createElement('canvas');
       canvas.width = CAPTURE_SIZE.width;
       canvas.height = CAPTURE_SIZE.height;
@@ -456,6 +469,7 @@ cr.define('options', function() {
         self.cameraImage = this.src;
       });
       previewImg.src = photoURL;
+      return true;
     },
 
     /**