[cros] Double-click fixes on Change Picture prefs page.

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;
 
+  /**
+   * Array of button URLs used on this page.
+   * @type {Array.<string>}
+   */
+  const ButtonImageUrls = [
+    ButtonImages.TAKE_PHOTO,
+    ButtonImages.CHOOSE_FILE
+  ];
+
   /////////////////////////////////////////////////////////////////////////////
   // ChangePictureOptions class:
 
   /**
    * Encapsulated handling of ChromeOS change picture options page.
    * @constructor
    */
   function ChangePictureOptions() {
     OptionsPage.call(
         this,
@@ skipping 60 matching lines @@
         $('images-grid').removeItem(this.oldImage_);
         this.oldImage_ = null;
       }
     },
 
     /**
      * Closes current page, returning back to Personal Stuff page.
      * @private
      */
     closePage_: function() {
+      $('images-grid').blur();  // Make sure the image grid is not active.
       OptionsPage.navigateToPage('personal');
     },
 
     /**
      * Handles "Take photo" button activation.
      * @private
      */
     handleTakePhoto_: function() {
       chrome.send('takePhoto');
       this.closePage_();
@@ skipping 13 matching lines @@
      * @private
      */
     handleImageActivated_: function() {
       switch ($('images-grid').selectedItemUrl) {
         case ButtonImages.TAKE_PHOTO:
           this.handleTakePhoto_();
           break;
         case ButtonImages.CHOOSE_FILE:
           this.handleChooseFile_();
           break;
-        case ButtonImages.PROFILE_PICTURE:
-          break;
         default:
           this.closePage_();
           break;
       }
     },
 
     /**
      * Handles double click on the image grid.
      * @param {Event} e Double click Event.
      */
     handleImageDblClick_: function(e) {
-      // Close page unless the click target is the grid itself,
-      // any of the buttons or the Profile image until it's not loaded.
+      // Close page unless the click target is the grid itself or
+      // any of the buttons.
       var url = e.target.src;
-      if (!url)
-        return;
-      for (var k in ButtonImages) {
-        if (url == ButtonImages[k])
-          return;
-      }
-      this.closePage_();
+      if (url && ButtonImageUrls.indexOf(url) == -1)
+        this.closePage_();
     },
 
     /**
      * URL of the current user image.
      * @type {string}
      */
     get currentUserImageUrl() {
       return 'chrome://userimage/' + PersonalOptions.getLoggedInUserEmail() +
           '?id=' + (new Date()).getTime();
     },
@@ skipping 84 matching lines @@
     };
   });
 
   // Export
   return {
     ChangePictureOptions: ChangePictureOptions
   };
 
 });