summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 10:02:00 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-04 10:02:00 +0000
commit9f3bc315c206fba247435c425c78fb6cf2d9cfd1 (patch)
treeaab513f525763204075d7b888da582baea414d03 /chrome/browser/chromeos
parentf35817da279591ed86e389f8bc8f76045e8676ae (diff)
downloadchromium_src-9f3bc315c206fba247435c425c78fb6cf2d9cfd1.zip
chromium_src-9f3bc315c206fba247435c425c78fb6cf2d9cfd1.tar.gz
chromium_src-9f3bc315c206fba247435c425c78fb6cf2d9cfd1.tar.bz2
Set selected user image instead of the last captured by camera.
BUG=none TEST=Get to user image screen. Click on video image. Verify that selected image is what was on the video image. Put your thumb to the camera. Click OK. Verify that on login screen the picture of yourself is shown, not your thumb. Review URL: http://codereview.chromium.org/2639002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r--chrome/browser/chromeos/login/user_image_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc
index a907840..d4aee44 100644
--- a/chrome/browser/chromeos/login/user_image_view.cc
+++ b/chrome/browser/chromeos/login/user_image_view.cc
@@ -215,7 +215,7 @@ void UserImageView::ButtonPressed(
return;
}
if (sender == ok_button_)
- delegate_->OnOK(*last_frame_);
+ delegate_->OnOK(selected_image_->GetImage());
else if (sender == cancel_button_)
delegate_->OnCancel();
else