MD Settings: Deactivate the Camera when leaving the Change Picture page.

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.
 
 /**
  * Contains the possible types of Change Picture selections.
  * @enum {string}
  */
 var ChangePictureSelectionTypes = {
   CAMERA: 'camera',
@@ skipping 17 matching lines @@
 
 /**
  * @fileoverview
  * 'settings-change-picture' is the settings subpage containing controls to
  * edit a ChromeOS user's picture.
  */
 Polymer({
   is: 'settings-change-picture',
 
   behaviors: [
+    settings.RouteObserverBehavior,
     I18nBehavior,
     WebUIListenerBehavior,
   ],
 
   properties: {
     /**
      * True if the user has a plugged-in webcam.
      * @private {boolean}
      */
     cameraPresent_: {
@@ skipping 77 matching lines @@
     this.addWebUIListener('default-images-changed',
                           this.receiveDefaultImages_.bind(this));
     this.addWebUIListener('selected-image-changed',
                           this.receiveSelectedImage_.bind(this));
     this.addWebUIListener('old-image-changed',
                           this.receiveOldImage_.bind(this));
     this.addWebUIListener('profile-image-changed',
                           this.receiveProfileImage_.bind(this));
     this.addWebUIListener('camera-presence-changed',
                           this.receiveCameraPresence_.bind(this));
+  },
 
-    this.browserProxy_.initialize();
+
+  /** @protected */
+  currentRouteChanged: function(newRoute) {
+    // Reset the selection state when we navigate to this page.
+    if (newRoute == settings.Route.CHANGE_PICTURE) {
+      this.browserProxy_.initialize();
+    } else {
+      // Ensure we deactivate the camera when we navigate away.
+      this.selectedItem_ = null;
+    }
   },
 
   /**
    * Handler for the 'default-images-changed' event.
    * @param {!Array<!settings.DefaultImage>} images
    * @private
    */
   receiveDefaultImages_: function(images) {
     this.defaultImages_ = images;
   },
@@ skipping 220 matching lines @@
         type != ChangePictureSelectionTypes.OLD;
   },
 
   /**
    * @param {boolean} cameraPresent
    * @param {ChangePictureImageElement} selectedItem
    * @return {boolean} True if the camera is selected in the image grid.
    * @private
    */
   isCameraActive_: function(cameraPresent, selectedItem) {
-    return cameraPresent && selectedItem &&
+    return cameraPresent && !!selectedItem &&
         selectedItem.dataset.type == ChangePictureSelectionTypes.CAMERA;
   },
 
   /**
    * @param {ChangePictureImageElement} selectedItem
    * @return {boolean} True if the discard controls should be hidden.
    * @private
    */
   isDiscardHidden_: function(selectedItem) {
     return !selectedItem ||
         selectedItem.dataset.type != ChangePictureSelectionTypes.OLD;
   },
 
   /**
    * @param {ChangePictureImageElement} selectedItem
    * @return {boolean} True if the author credit text is shown.
    * @private
    */
   isAuthorCreditShown_: function(selectedItem) {
-    return selectedItem &&
+    return !!selectedItem &&
         selectedItem.dataset.type == ChangePictureSelectionTypes.DEFAULT;
   },
 
   /**
    * @param {!ChangePictureImageElement} selectedItem
    * @param {!Array<!settings.DefaultImage>} defaultImages
    * @return {string} The author name for the selected default image. An empty
    *     string is returned if there is no valid author name.
    * @private
    */
@@ skipping 15 matching lines @@
    */
   getAuthorWebsite_: function(selectedItem, defaultImages) {
     if (!this.isAuthorCreditShown_(selectedItem))
       return '';
 
     assert(selectedItem.dataset.defaultImageIndex !== null &&
            selectedItem.dataset.defaultImageIndex < defaultImages.length);
     return defaultImages[selectedItem.dataset.defaultImageIndex].website;
   },
 });