| Index: chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| index 7427e2803e62622e49a906e2c4d109dd4939d5b3..32e81d9624467be5c771ef0fd736daf3362418e6 100644
|
| --- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
|
| @@ -61,7 +61,6 @@ const char kJsApiUserManagerAuthLaunchUser[] = "authenticatedLaunchUser";
|
| const char kJsApiUserManagerLaunchGuest[] = "launchGuest";
|
| const char kJsApiUserManagerLaunchUser[] = "launchUser";
|
| const char kJsApiUserManagerRemoveUser[] = "removeUser";
|
| -const char kJsApiUserManagerCustomButtonClicked[] = "customButtonClicked";
|
| const char kJsApiUserManagerAttemptUnlock[] = "attemptUnlock";
|
|
|
| const size_t kAvatarIconSize = 180;
|
| @@ -141,7 +140,7 @@ extensions::ScreenlockPrivateEventRouter* GetScreenlockRouter(
|
| profile);
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| // ProfileUpdateObserver ------------------------------------------------------
|
|
|
| @@ -222,8 +221,7 @@ void UserManagerScreenHandler::ShowBannerMessage(const std::string& message) {
|
|
|
| void UserManagerScreenHandler::ShowUserPodButton(
|
| const std::string& user_email,
|
| - const gfx::Image& icon,
|
| - const base::Closure& callback) {
|
| + const gfx::Image& icon) {
|
| GURL icon_url(webui::GetBitmapDataUrl(icon.AsBitmap()));
|
| web_ui()->CallJavascriptFunction(
|
| "login.AccountPickerScreen.showUserPodButton",
|
| @@ -403,11 +401,6 @@ void UserManagerScreenHandler::HandleLaunchUser(const base::ListValue* args) {
|
| ProfileMetrics::SWITCH_PROFILE_MANAGER);
|
| }
|
|
|
| -void UserManagerScreenHandler::HandleCustomButtonClicked(
|
| - const base::ListValue* args) {
|
| - // TODO(xiyuan): Remove this. Deprecated now.
|
| -}
|
| -
|
| void UserManagerScreenHandler::HandleAttemptUnlock(
|
| const base::ListValue* args) {
|
| std::string email;
|
| @@ -457,9 +450,6 @@ void UserManagerScreenHandler::RegisterMessages() {
|
| web_ui()->RegisterMessageCallback(kJsApiUserManagerRemoveUser,
|
| base::Bind(&UserManagerScreenHandler::HandleRemoveUser,
|
| base::Unretained(this)));
|
| - web_ui()->RegisterMessageCallback(kJsApiUserManagerCustomButtonClicked,
|
| - base::Bind(&UserManagerScreenHandler::HandleCustomButtonClicked,
|
| - base::Unretained(this)));
|
| web_ui()->RegisterMessageCallback(kJsApiUserManagerAttemptUnlock,
|
| base::Bind(&UserManagerScreenHandler::HandleAttemptUnlock,
|
| base::Unretained(this)));
|
|
|