[cros] OOBE avatar picker fixes and polishing.

chrome/browser/resources/chromeos/login/oobe_screen_user_image.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.
 
 /**
  * @fileoverview Oobe user image screen implementation.
  */
 
 cr.define('oobe', function() {
   var UserImagesGrid = options.UserImagesGrid;
@@ skipping 268 matching lines @@
       this.profileImageLoading = false;
       if (imageUrl !== null) {
         this.profileImagePresent_ = true;
         this.profileImageUrl_ = imageUrl;
         this.profileImage_ =
             $('user-image-grid').updateItem(this.profileImage_, imageUrl);
       }
     },
 
     /**
-<<<<<<< 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,
      * including URL, title, author and website.
      * @private
      */
     setDefaultImages_: function(images) {
       var imageGrid = $('user-image-grid');
       for (var i = 0, data; data = imagesData[i]; i++) {
         imageGrid.addItem(data.url, data.title);
@@ skipping 69 matching lines @@
           function(el) {  // Custom decorator for Profile image element.
             var spinner = el.ownerDocument.createElement('div');
             spinner.className = 'spinner';
             var spinnerBg = el.ownerDocument.createElement('div');
             spinnerBg.className = 'spinner-bg';
             spinnerBg.appendChild(spinner);
             el.appendChild(spinnerBg);
             el.id = 'profile-image';
           });
       this.profileImage_.type = 'profile';
+      this.profileImageLoading = true;
 
       // Add camera stream element.
       imageGrid.cameraImage = null;
 
       // Perform an early check if camera is present, without starting capture.
       imageGrid.checkCameraPresence(false, false);
 
       $('take-photo').addEventListener(
           'click', this.handleTakePhoto_.bind(this));
       $('discard-photo').addEventListener(
@@ skipping 218 matching lines @@
   ].forEach(function(name) {
     UserImageScreen[name] = function(value) {
       $('user-image')[name + '_'](value);
     };
   });
 
   return {
     UserImageScreen: UserImageScreen
   };
 });