summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 17:15:12 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 17:15:12 +0000
commit6e50d42bdd5307d76a90fb398774d140f796eace (patch)
treed27fdbdaf6106a62fa45a48e0543eff70dde6ae4 /chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
parent3d48423a74668a7cfd71ba895a2c510ec85447b5 (diff)
downloadchromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.zip
chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.gz
chromium_src-6e50d42bdd5307d76a90fb398774d140f796eace.tar.bz2
Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."
> CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. > > BUG=None > R=nkostylev@chromium.org > TBR=sky@chromium.org > > Review URL: https://codereview.chromium.org/253063002 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/260783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc')
-rw-r--r--chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 554839b..2c0732e 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -269,13 +269,13 @@ void ChangePictureOptionsHandler::SendSelectedImage() {
switch (previous_image_index_) {
case User::kExternalImageIndex: {
// User has image from camera/file, record it and add to the image list.
- previous_image_ = user->GetImage();
+ previous_image_ = user->image();
SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));
break;
}
case User::kProfileImageIndex: {
// User has his/her Profile image as the current image.
- SendProfileImage(user->GetImage(), true);
+ SendProfileImage(user->image(), true);
break;
}
default: {