Settings People Revamp: Change Picture: Add accessibility-key usage.

chrome/browser/resources/settings/people_page/camera.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.
 
 /**
  * @fileoverview
  * 'settings-camera' is the Polymer control used to take a picture from the
  * user webcam to use as a ChromeOS profile picture.
  *
  * @group Chrome Settings Elements
@@ skipping 48 matching lines @@
   },
 
   /** @override */
   attached: function() {
     this.$.cameraVideo.addEventListener('canplay', function() {
       this.cameraOnline_ = true;
     }.bind(this));
   },
 
   /**
+   * Performs photo capture from the live camera stream. 'phototaken' event
+   * will be fired as soon as captured photo is available, with 'dataURL'
+   * property containing the photo encoded as a data URL.
+   * @private
+   */
+  takePhoto: function() {
+    if (!this.cameraOnline_)
+      return;
+    var canvas =
+        /** @type {HTMLCanvasElement} */ (document.createElement('canvas'));

[Dan Beam, 2016/02/29 19:26:01]

nit: don't put spaces between */ and (

[tommycli, 2016/02/29 20:28:25]

Hi. This was the result of git cl format, and seems to match the example set in
the closure annotations docs:
https://developers.google.com/closure/compiler/docs/js-for-compiler#instantia...

Thanks.

+    canvas.width = CAPTURE_SIZE.width;
+    canvas.height = CAPTURE_SIZE.height;
+    this.captureFrame_(
+        this.$.cameraVideo,
+        /** @type {!CanvasRenderingContext2D} */ (canvas.getContext('2d')));
+
+    var photoDataUrl = this.isFlipped_ ? this.flipFrame_(canvas) :
+                                         canvas.toDataURL('image/png');
+    this.fire('phototaken', {photoDataUrl: photoDataUrl});
+
+    announceAccessibleMessage(
+        loadTimeData.getString('photoCaptureAccessibleText'));
+  },
+
+  /**
    * Observer for the cameraActive property.
    * @private
    */
   cameraActiveChanged_: function() {
     if (this.cameraActive)
       this.startCamera_();
     else
       this.stopCamera_();
   },
 
@@ skipping 54 matching lines @@
   onTapFlipPhoto_: function() {
     this.isFlipped_ = !this.isFlipped_;
     this.$.userImageStreamCrop.classList.toggle('flip-x', this.isFlipped_);
 
     var flipMessageId = this.isFlipped_ ?
        'photoFlippedAccessibleText' : 'photoFlippedBackAccessibleText';
     announceAccessibleMessage(loadTimeData.getString(flipMessageId));
   },
 
   /**
-   * Performs photo capture from the live camera stream. 'phototaken' event
-   * will be fired as soon as captured photo is available, with 'dataURL'
-   * property containing the photo encoded as a data URL.
-   * @private
-   */
-  onTapTakePhoto_: function() {
-    if (!this.cameraOnline_)
-      return;
-    var canvas = /** @type {HTMLCanvasElement} */(
-        document.createElement('canvas'));
-    canvas.width = CAPTURE_SIZE.width;
-    canvas.height = CAPTURE_SIZE.height;
-    this.captureFrame_(
-        this.$.cameraVideo,
-        /** @type {!CanvasRenderingContext2D} */(canvas.getContext('2d')));
-
-    var photoDataUrl = this.isFlipped_ ? this.flipFrame_(canvas) :
-                                         canvas.toDataURL('image/png');
-    this.fire('phototaken', {photoDataUrl: photoDataUrl});
-
-    announceAccessibleMessage(
-        loadTimeData.getString('photoCaptureAccessibleText'));
-  },
-
-  /**
    * Captures a single still frame from a <video> element, placing it at the
    * current drawing origin of a canvas context.
    * @param {!HTMLVideoElement} video Video element to capture from.
    * @param {!CanvasRenderingContext2D} ctx Canvas context to draw onto.
    * @private
    */
   captureFrame_: function(video, ctx) {
     var width = video.videoWidth;
     var height = video.videoHeight;
     if (width < CAPTURE_SIZE.width || height < CAPTURE_SIZE.height) {
@@ skipping 28 matching lines @@
     canvas.height = CAPTURE_SIZE.height;
     var ctx = canvas.getContext('2d');
     ctx.translate(CAPTURE_SIZE.width, 0);
     ctx.scale(-1.0, 1.0);
     ctx.drawImage(source, 0, 0);
     return canvas.toDataURL('image/png');
   },
 });
 
 })();