| Index: chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc (revision 103795)
|
| +++ chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc (working copy)
|
| @@ -4,7 +4,8 @@
|
|
|
| #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
|
|
|
| -#include "base/callback.h"
|
| +#include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| #include "base/logging.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/chromeos/login/default_user_images.h"
|
| @@ -117,15 +118,15 @@
|
| }
|
|
|
| void UserImageScreenHandler::RegisterMessages() {
|
| - web_ui_->RegisterMessageCallback(
|
| - "takePhoto",
|
| - NewCallback(this, &UserImageScreenHandler::HandleTakePhoto));
|
| - web_ui_->RegisterMessageCallback(
|
| - "selectImage",
|
| - NewCallback(this, &UserImageScreenHandler::HandleSelectImage));
|
| - web_ui_->RegisterMessageCallback(
|
| - "onUserImageAccepted",
|
| - NewCallback(this, &UserImageScreenHandler::HandleImageAccepted));
|
| + web_ui_->RegisterMessageCallback("takePhoto",
|
| + base::Bind(&UserImageScreenHandler::HandleTakePhoto,
|
| + base::Unretained(this)));
|
| + web_ui_->RegisterMessageCallback("selectImage",
|
| + base::Bind(&UserImageScreenHandler::HandleSelectImage,
|
| + base::Unretained(this)));
|
| + web_ui_->RegisterMessageCallback("onUserImageAccepted",
|
| + base::Bind(&UserImageScreenHandler::HandleImageAccepted,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void UserImageScreenHandler::OnPhotoAccepted(const SkBitmap& photo) {
|
|
|