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

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() {
 
   var OptionsPage = options.OptionsPage;
   var UserImagesGrid = options.UserImagesGrid;
   var ButtonImages = UserImagesGrid.ButtonImages;
 
@@ skipping 374 matching lines @@
     handleImageSelected_: function() {
       var imageGrid = $('user-image-grid');
       var url = imageGrid.selectedItemUrl;
       // Ignore selection change caused by program itself and selection of one
       // of the action buttons.
       if (!imageGrid.inProgramSelection &&
           url != ButtonImages.TAKE_PHOTO && url != ButtonImages.CHOOSE_FILE) {
         chrome.send('selectImage', [url]);
       }
       // 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') {
             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();
         }
       }
       // 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 =
           (image.author || image.website) ? 'visible' : 'hidden';
@@ skipping 97 matching lines @@
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ChangePictureOptions: ChangePictureOptions
   };
 
 });