Settings People Revamp: Change Picture Minor accessibility upgrades

chrome/browser/resources/settings/people_page/change_picture.js

 // Copyright 2015 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('settings_test', function() {
   var changePictureOptions = settings_test.changePictureOptions || {
     /**
      * True if property changes should fire events for testing purposes.
      * @type {boolean}
      */
@@ skipping 142 matching lines @@
         this.$.selector.select(this.$.selector.indexOf(this.$.oldImage));
       }.bind(this),
 
       /**
        * Called from C++ to provide the URL of the profile image.
        * @param {string} imageUrl
        * @param {boolean} selected
        */
       receiveProfileImage: function(imageUrl, selected) {
         this.profileImageUrl_ = imageUrl;
+        this.$.profileImage.alt = this.i18n('profilePhoto');
 
         if (!selected)
           return;
 
         this.fallbackImage_ = this.$.profileImage;
 
         // If user is currently taking a photo, do not steal the focus.
         if (!this.selectedItem_ || this.selectedItem_.dataset.type != 'camera')
           this.$.selector.select(this.$.selector.indexOf(this.$.profileImage));
       }.bind(this),
@@ skipping 55 matching lines @@
     this.selectImage_(image);
   },
 
   /**
    * Handle photo captured event, which contains the data URL of the image.
    * @param {!{detail: !{photoDataUrl: string}}} event
    * containing a data URL.
    */
   onPhotoTaken_: function(event) {
     settings.ChangePicturePrivateApi.photoTaken(event.detail.photoDataUrl);
-
-    // TODO(tommycli): Add announce of accessible message for photo capture.
   },
 
   /**
    * Discard currently selected old image. Selects the first default icon.
    * Returns to the camera stream if the user had just taken a picture.
    * @private
    */
   onTapDiscardOldImage_: function() {
     this.oldImageUrl_ = '';
 
     if (this.lastSelectedImageType_ == 'camera')
       this.$.selector.select(this.$.selector.indexOf(this.$.cameraImage));
 
     if (this.fallbackImage_ != null) {
       this.selectImage_(this.fallbackImage_);
       return;
     }
 
     // If the user has not chosen an image since opening the subpage and
     // discards the current photo, select the first default image.
     assert(this.defaultImages_.length > 0);
     settings.ChangePicturePrivateApi.selectDefaultImage(
         this.defaultImages_[0].url);
+
+    announceAccessibleMessage(
+        loadTimeData.getString('photoDiscardAccessibleText'));
   },
 
   /**
    * @param {string} oldImageUrl
    * @return {boolean} True if there is no old image and the old image icon
    *     should be hidden.
    * @private
    */
   isOldImageHidden_: function(oldImageUrl) { return oldImageUrl.length == 0; },
 
   /**
    * @param {settings.ChangePictureImageElement} selectedItem
+   * @return {boolean} True if the preview image should be hidden.
+   * @private
+   */
+  isPreviewImageHidden_: function(selectedItem) {
+    if (selectedItem == undefined)
+      return true;
+
+    var type = selectedItem.dataset.type;
+    return type != 'default' && type != 'profile' && type != 'old';
+  },
+
+  /**
+   * @param {settings.ChangePictureImageElement} selectedItem
    * @return {boolean} True if the camera is selected in the image grid.
    * @private
    */
   isCameraActive_: function(cameraPresent, selectedItem) {
     return cameraPresent &&
            selectedItem != undefined &&
            selectedItem.dataset.type == 'camera';
   },
 
   /**
@@ skipping 37 matching lines @@
    * @private
    */
   getAuthorWebsite_: function(selectedItem, defaultImages) {
     if (!this.isAuthorCreditShown_(selectedItem))
       return '';
 
     assert(selectedItem.dataset.defaultImageIndex < defaultImages.length);
     return defaultImages[selectedItem.dataset.defaultImageIndex].website;
   },
 });