[cros] Profile image no longer selected when user clicks Take Photo/Choose File buttons.

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 30 matching lines @@
     /**
      * Initializes ChangePictureOptions page.
      */
     initializePage: function() {
       // Call base class implementation to start preferences initialization.
       OptionsPage.prototype.initializePage.call(this);
 
       var imageGrid = $('images-grid');
       UserImagesGrid.decorate(imageGrid);
 
-      imageGrid.addEventListener('change', function(e) {
-        // Ignore programmatical selection.
-        if (!imageGrid.inProgramSelection) {
-          // Button selections will be ignored by Chrome handler.
-          chrome.send('selectImage', [this.selectedItemUrl || '']);
-        }
-      });
+      imageGrid.addEventListener('change',
+                                 this.handleImageSelected_.bind(this));
       imageGrid.addEventListener('activate',
                                  this.handleImageActivated_.bind(this));
       imageGrid.addEventListener('dblclick',
                                  this.handleImageDblClick_.bind(this));
 
       // Add the "Choose file" button.
       imageGrid.addItem(ButtonImages.CHOOSE_FILE,
                         localStrings.getString('chooseFile'),
                         this.handleChooseFile_.bind(this));
 
@@ skipping 45 matching lines @@
     /**
      * Handles "Choose a file" button activation.
      * @private
      */
     handleChooseFile_: function() {
       chrome.send('chooseFile');
       this.closePage_();
     },
 
     /**
+     * Handles image selection change.
+     * @private
+     */
+    handleImageSelected_: function() {
+      var imageGrid = $('images-grid');
+      var url = imageGrid.selectedItemUrl;
+      // Ignore empty, programmatical and button selection.

[whywhat, 2011/12/08 17:27:50]

I'd rather tell reader here what empty url and programmatical flags actually
mean like:
// Ignore selection change to unset image, caused by program itself or to one of
the action buttons.

[Ivan Korotkov, 2011/12/09 09:30:23]

Done.

+      if (!imageGrid.inProgramSelection &&

[whywhat, 2011/12/08 17:27:50]

I'd reorder and reformat like this:
if (url &&
    !imageGrid.inProgramSelection &&
    ButtonImageUrls.indexOf(url) == -1) {

to match the order in comment and make it easier to parse.

[Ivan Korotkov, 2011/12/09 09:30:23]

Done.

+          url && ButtonImageUrls.indexOf(url) == -1) {
+        chrome.send('selectImage', [url]);
+      }
+    },
+
+    /**
      * Handles image activation (by pressing Enter).
      * @private
      */
     handleImageActivated_: function() {
       switch ($('images-grid').selectedItemUrl) {
         case ButtonImages.TAKE_PHOTO:
           this.handleTakePhoto_();
           break;
         case ButtonImages.CHOOSE_FILE:
           this.handleChooseFile_();
@@ skipping 111 matching lines @@
     };
   });
 
   // Export
   return {
     ChangePictureOptions: ChangePictureOptions
   };
 
 });