Settings: Change Picture: Fix update on revisit

Currently re-visiting the change picture page will not
request an image update.

Bug: 730031
Change-Id: I69afb9ef5a51f5d69ae31df2090b2776a39f8ada
Reviewed-on: https://chromium-review.googlesource.com/570817
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487270}

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

@@ -88,6 +88,7 @@ Polymer({
   currentRouteChanged: function(newRoute) {
     if (newRoute == settings.routes.CHANGE_PICTURE) {
       this.browserProxy_.initialize();
+      this.browserProxy_.requestSelectedImage();
       this.pictureList_.setFocus();
     } else {
       // Ensure we deactivate the camera when we navigate away.

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

@@ -61,6 +61,9 @@ cr.define('settings', function() {
      * expected.
      */
     chooseFile() {}
+
+    /** Requests the currently selected image. */
+    requestSelectedImage() {}
   }
 
   /**
@@ -96,6 +99,11 @@ cr.define('settings', function() {
     chooseFile() {
       chrome.send('chooseFile');
     }
+
+    /** @override */
+    requestSelectedImage() {
+      chrome.send('requestSelectedImage');
+    }
   }
 
   // The singleton instance_ is replaced with a test version of this wrapper

chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

@@ -114,6 +114,10 @@ void ChangePictureHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "selectImage", base::Bind(&ChangePictureHandler::HandleSelectImage,
                                 base::Unretained(this)));
+  web_ui()->RegisterMessageCallback(
+      "requestSelectedImage",
+      base::Bind(&ChangePictureHandler::HandleRequestSelectedImage,
+                 base::Unretained(this)));
 }
 
 void ChangePictureHandler::OnJavascriptAllowed() {
@@ -322,6 +326,11 @@ void ChangePictureHandler::HandleSelectImage(const base::ListValue* args) {
     ImageDecoder::Cancel(this);
 }
 
+void ChangePictureHandler::HandleRequestSelectedImage(
+    const base::ListValue* args) {
+  SendSelectedImage();
+}
+
 void ChangePictureHandler::FileSelected(const base::FilePath& path,
                                         int index,
                                         void* params) {

chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h

@@ -87,6 +87,9 @@ class ChangePictureHandler : public ::settings::SettingsPageUIHandler,
   // Selects one of the available images as user's.
   void HandleSelectImage(const base::ListValue* args);
 
+  // Requests the currently selected image.
+  void HandleRequestSelectedImage(const base::ListValue* args);
+
   // SelectFileDialog::Delegate implementation.
   void FileSelected(const base::FilePath& path,
                     int index,

chrome/test/data/webui/settings/people_page_change_picture_test.js

@@ -16,6 +16,7 @@ cr.define('settings_people_page_change_picture', function() {
       'selectProfileImage',
       'photoTaken',
       'chooseFile',
+      'requestSelectedImage',
     ]);
   };
 
@@ -76,6 +77,11 @@ cr.define('settings_people_page_change_picture', function() {
     chooseFile: function() {
       this.methodCalled('chooseFile');
     },
+
+    /** @override */
+    requestSelectedImage: function() {
+      this.methodCalled('requestSelectedImage');
+    },
   };
 
   function registerChangePictureTests() {
@@ -187,6 +193,8 @@ cr.define('settings_people_page_change_picture', function() {
       });
 
       test('ChangePictureOldImage', function() {
+        assertFalse(!!changePicture.selectedItem_);
+
         // By default there is no old image and the element is hidden.
         var oldImage = crPictureList.$.oldImage;
         assertTrue(!!oldImage);
@@ -195,15 +203,20 @@ cr.define('settings_people_page_change_picture', function() {
         cr.webUIListenerCallback('old-image-changed', 'fake-old-image.jpg');
         Polymer.dom.flush();
 
-        // Expect the old image to be selected once an old image is sent via
-        // the native interface.
-        expectEquals(CrPicture.SelectionTypes.OLD,
-                     changePicture.selectedItem_.dataset.type);
-        expectFalse(oldImage.hidden);
-        expectFalse(crPicturePane.cameraActive_);
-        var discard = crPicturePane.$$('#discard');
-        assertTrue(!!discard);
-        expectFalse(discard.hidden);
+        return new Promise(function(resolve) {
+          changePicture.async(resolve);
+        }).then(function() {
+          assertTrue(!!changePicture.selectedItem_);
+          // Expect the old image to be selected once an old image is sent via
+          // the native interface.
+          expectEquals(CrPicture.SelectionTypes.OLD,
+                       changePicture.selectedItem_.dataset.type);
+          expectFalse(oldImage.hidden);
+          expectFalse(crPicturePane.cameraActive_);
+          var discard = crPicturePane.$$('#discard');
+          assertTrue(!!discard);
+          expectFalse(discard.hidden);
+        });
       });
 
       test('ChangePictureSelectFirstDefaultImage', function() {

ui/webui/resources/cr_elements/chromeos/cr_picture/cr_picture_list.js

@@ -118,12 +118,14 @@ Polymer({
    */
   setOldImageUrl(imageUrl) {
     this.oldImageUrl_ = imageUrl;
-    if (imageUrl)
+    if (imageUrl) {
       this.$.selector.select(this.$.selector.indexOf(this.$.oldImage));
-    else if (this.cameraSelected_)
+      this.selectedImageUrl_ = imageUrl;
+    } else if (this.cameraSelected_) {
       this.$.selector.select(this.$.selector.indexOf(this.$.cameraImage));
-    else if (this.fallbackImage_)
+    } else if (this.fallbackImage_) {
       this.selectImage_(this.fallbackImage_, true /* activate */);
+    }
   },
 
   /**
@@ -135,6 +137,7 @@ Polymer({
     if (!this.selectedItem ||
         this.selectedItem.dataset.type != CrPicture.SelectionTypes.CAMERA) {
       this.$.selector.select(this.$.selector.indexOf(image));
+      this.selectedItem = image;
     }
   },