| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc (revision 103795)
|
| +++ chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc (working copy)
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
|
|
|
| +#include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| #include "base/command_line.h"
|
| #include "base/hash_tables.h"
|
| #include "base/stringprintf.h"
|
| @@ -280,37 +282,50 @@
|
| network_state_informer_.reset(new NetworkStateInformer(web_ui_));
|
|
|
| web_ui_->RegisterMessageCallback("authenticateUser",
|
| - NewCallback(this, &SigninScreenHandler::HandleAuthenticateUser));
|
| + base::Bind(&SigninScreenHandler::HandleAuthenticateUser,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("completeLogin",
|
| - NewCallback(this, &SigninScreenHandler::HandleCompleteLogin));
|
| + base::Bind(&SigninScreenHandler::HandleCompleteLogin,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("getUsers",
|
| - NewCallback(this, &SigninScreenHandler::HandleGetUsers));
|
| + base::Bind(&SigninScreenHandler::HandleGetUsers,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("launchIncognito",
|
| - NewCallback(this, &SigninScreenHandler::HandleLaunchIncognito));
|
| + base::Bind(&SigninScreenHandler::HandleLaunchIncognito,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("fixCaptivePortal",
|
| - NewCallback(this, &SigninScreenHandler::HandleFixCaptivePortal));
|
| + base::Bind(&SigninScreenHandler::HandleFixCaptivePortal,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("showAddUser",
|
| - NewCallback(this, &SigninScreenHandler::HandleShowAddUser));
|
| + base::Bind(&SigninScreenHandler::HandleShowAddUser,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("shutdownSystem",
|
| - NewCallback(this, &SigninScreenHandler::HandleShutdownSystem));
|
| + base::Bind(&SigninScreenHandler::HandleShutdownSystem,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("removeUser",
|
| - NewCallback(this, &SigninScreenHandler::HandleRemoveUser));
|
| + base::Bind(&SigninScreenHandler::HandleRemoveUser,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("toggleEnrollmentScreen",
|
| - NewCallback(this, &SigninScreenHandler::HandleToggleEnrollmentScreen));
|
| + base::Bind(&SigninScreenHandler::HandleToggleEnrollmentScreen,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("launchHelpApp",
|
| - NewCallback(this, &SigninScreenHandler::HandleLaunchHelpApp));
|
| + base::Bind(&SigninScreenHandler::HandleLaunchHelpApp,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("createAccount",
|
| - NewCallback(this, &SigninScreenHandler::HandleCreateAccount));
|
| + base::Bind(&SigninScreenHandler::HandleCreateAccount,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("loginWebuiReady",
|
| - NewCallback(this, &SigninScreenHandler::HandleLoginWebuiReady));
|
| + base::Bind(&SigninScreenHandler::HandleLoginWebuiReady,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("loginRequestNetworkState",
|
| - NewCallback(this, &SigninScreenHandler::HandleLoginRequestNetworkState));
|
| + base::Bind(&SigninScreenHandler::HandleLoginRequestNetworkState,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("loginAddNetworkStateObserver",
|
| - NewCallback(this,
|
| - &SigninScreenHandler::HandleLoginAddNetworkStateObserver));
|
| + base::Bind(&SigninScreenHandler::HandleLoginAddNetworkStateObserver,
|
| + base::Unretained(this)));
|
| web_ui_->RegisterMessageCallback("loginRemoveNetworkStateObserver",
|
| - NewCallback(this,
|
| - &SigninScreenHandler::HandleLoginRemoveNetworkStateObserver));
|
| + base::Bind(&SigninScreenHandler::HandleLoginRemoveNetworkStateObserver,
|
| + base::Unretained(this)));
|
| }
|
|
|
| void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) {
|
|
|