Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / options / chromeos / change_picture_options_handler.cc

diff --git a/src/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/src/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 014c86f..554839b 100644 (file)
--- a/src/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/src/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
@@ -220,7 +220,7 @@ void ChangePictureOptionsHandler::HandleDiscardPhoto(
 
 void ChangePictureOptionsHandler::HandlePhotoTaken(
     const base::ListValue* args) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::string image_url;
   if (!args || args->GetSize() != 1 || !args->GetString(0, &image_url))
     NOTREACHED();
@@ -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->image();
+      previous_image_ = user->GetImage();
       SendOldImage(webui::GetBitmapDataUrl(*previous_image_.bitmap()));
       break;
     }
     case User::kProfileImageIndex: {
       // User has his/her Profile image as the current image.
-      SendProfileImage(user->image(), true);
+      SendProfileImage(user->GetImage(), true);
       break;
     }
     default: {