[cros] Avatar picker: various fixes for web camera problems.

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 457 matching lines @@
           this.handleTakePhoto_();
           break;
         default:
           this.acceptImage_();
           break;
       }
     },
 
     /**
      * Handles selection change.
+     * @param {cr.Event} e Selection change event.
      * @private
      */
-    handleSelect_: function() {
+    handleSelect_: function(e) {
       var imageGrid = $('user-image-grid');
       if (imageGrid.selectionType == 'camera' && imageGrid.cameraLive) {
         // No current image selected.
         $('ok-button').disabled = true;
       } else {
         $('ok-button').disabled = false;
         chrome.send('selectImage', [imageGrid.selectedItemUrl]);
       }
       // Start/stop camera on (de)selection.
-      if (!imageGrid.inProgramSelection) {
-        if (imageGrid.selectionType == 'camera' && !imageGrid.cameraOnline) {
+      if (!imageGrid.inProgramSelection &&
+          imageGrid.selectionType != e.oldSelectionType) {
+        if (imageGrid.selectionType == 'camera') {
           // Programmatic selection of camera item is done in
           // checkCameraPresence callback where streaming is started by itself.
           imageGrid.checkCameraPresence(
               function() {  // When present.
                 // Start capture if camera is still the selected item.
                 return imageGrid.selectedItem == imageGrid.cameraImage;
               },
               function() {  // When absent.
                 return true;  // Check again after some time.
               });
-        } else if (imageGrid.selectionType != 'camera' &&
-                   imageGrid.cameraOnline) {
+        } else {
           imageGrid.stopCamera();
         }
       }
       this.updateCaption_();
       // Update image attribution text.
       var image = imageGrid.selectedItem;
       $('user-image-author-name').textContent = image.author;
       $('user-image-author-website').textContent = image.website;
       $('user-image-author-website').href = image.website;
       $('user-image-attribution').style.visibility =
@@ skipping 129 matching lines @@
   ].forEach(function(name) {
     UserImageScreen[name] = function(value) {
       $('user-image')[name + '_'](value);
     };
   });
 
   return {
     UserImageScreen: UserImageScreen
   };
 });