cros: Clean up screenlockPrivate plumbing.

chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
@@ skipping 43 matching lines @@
 const char kKeyAvatarUrl[] = "userImage";
 const char kKeyNeedsSignin[] = "needsSignin";
 
 // JS API callback names.
 const char kJsApiUserManagerInitialize[] = "userManagerInitialize";
 const char kJsApiUserManagerAddUser[] = "addUser";
 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;
 
 void HandleAndDoNothing(const base::ListValue* args) {
 }
 
 // This callback is run if the only profile has been deleted, and a new
 // profile has been created to replace it.
 void OpenNewWindowForProfile(
@@ skipping 59 matching lines @@
   ProfileInfoCache& info_cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   const size_t profile_index = GetIndexOfProfileWithEmailAndName(
       info_cache, base::UTF8ToUTF16(email), base::string16());
   Profile* profile = g_browser_process->profile_manager()
       ->GetProfileByPath(info_cache.GetPathOfProfileAtIndex(profile_index));
   return extensions::ScreenlockPrivateEventRouter::GetFactoryInstance()->Get(
       profile);
 }
 
-} // namespace
+}  // namespace
 
 // ProfileUpdateObserver ------------------------------------------------------
 
 class UserManagerScreenHandler::ProfileUpdateObserver
     : public ProfileInfoCacheObserver {
  public:
   ProfileUpdateObserver(
       ProfileManager* profile_manager, UserManagerScreenHandler* handler)
       : profile_manager_(profile_manager),
         user_manager_handler_(handler) {
@@ skipping 58 matching lines @@
 UserManagerScreenHandler::~UserManagerScreenHandler() {
   ScreenlockBridge::Get()->SetLockHandler(NULL);
 }
 
 void UserManagerScreenHandler::ShowBannerMessage(const std::string& message) {
   web_ui()->CallJavascriptFunction(
       "login.AccountPickerScreen.showBannerMessage",
       base::StringValue(message));
 }
 
-void UserManagerScreenHandler::ShowUserPodButton(
+void UserManagerScreenHandler::ShowUserPodCustomIcon(
     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",
+      "login.AccountPickerScreen.showUserPodCustomIcon",
       base::StringValue(user_email),
       base::StringValue(icon_url.spec()));
 }
 
-void UserManagerScreenHandler::HideUserPodButton(
+void UserManagerScreenHandler::HideUserPodCustomIcon(
     const std::string& user_email) {
   web_ui()->CallJavascriptFunction(
-      "login.AccountPickerScreen.hideUserPodButton",
+      "login.AccountPickerScreen.hideUserPodCustomIcon",
       base::StringValue(user_email));
 }
 
 void UserManagerScreenHandler::EnableInput() {
   // Nothing here because UI is not disabled when starting to authenticate.
 }
 
 void UserManagerScreenHandler::SetAuthType(
     const std::string& user_email,
     ScreenlockBridge::LockHandler::AuthType auth_type,
@@ skipping 148 matching lines @@
   ProfileMetrics::LogProfileAuthResult(ProfileMetrics::AUTH_UNNECESSARY);
 
   base::FilePath path = info_cache.GetPathOfProfileAtIndex(profile_index);
   profiles::SwitchToProfile(path,
                             desktop_type_,
                             false,  /* reuse any existing windows */
                             base::Bind(&OnSwitchToProfileComplete),
                             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;
   CHECK(args->GetString(0, &email));
   GetScreenlockRouter(email)->OnAuthAttempted(GetAuthType(email), "");
 }
 
 void UserManagerScreenHandler::OnClientLoginSuccess(
     const ClientLoginResult& result) {
   chrome::SetLocalAuthCredentials(authenticating_profile_index_,
@@ skipping 29 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kJsApiUserManagerLaunchGuest,
       base::Bind(&UserManagerScreenHandler::HandleLaunchGuest,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(kJsApiUserManagerLaunchUser,
       base::Bind(&UserManagerScreenHandler::HandleLaunchUser,
                  base::Unretained(this)));
   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)));
 
   const content::WebUI::MessageCallback& kDoNothingCallback =
       base::Bind(&HandleAndDoNothing);
 
   // Unused callbacks from screen_account_picker.js
   web_ui()->RegisterMessageCallback("accountPickerReady", kDoNothingCallback);
   web_ui()->RegisterMessageCallback("loginUIStateChanged", kDoNothingCallback);
@@ skipping 83 matching lines @@
   localized_strings->SetString("slideCompleteAddUser",
       l10n_util::GetStringUTF16(
           IDS_USER_MANAGER_TUTORIAL_SLIDE_OUTRO_ADD_USER));
 
   // Strings needed for the user_pod_template public account div, but not ever
   // actually displayed for desktop users.
   localized_strings->SetString("publicAccountReminder", base::string16());
   localized_strings->SetString("publicAccountEnter", base::string16());
   localized_strings->SetString("publicAccountEnterAccessibleName",
                                base::string16());
-  localized_strings->SetString("multiple-signin-banner-text",
-                               base::string16());
   localized_strings->SetString("signinBannerText", base::string16());
   localized_strings->SetString("launchAppButton", base::string16());
   localized_strings->SetString("multiProfilesRestrictedPolicyTitle",
                                base::string16());
   localized_strings->SetString("multiProfilesNotAllowedPolicyMsg",
                                 base::string16());
   localized_strings->SetString("multiProfilesPrimaryOnlyPolicyMsg",
                                 base::string16());
 }
 
@@ skipping 63 matching lines @@
   } else {
     web_ui()->CallJavascriptFunction(
         "cr.ui.Oobe.showSignInError",
         base::FundamentalValue(0),
         base::StringValue(
             l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_AUTHENTICATING)),
         base::StringValue(""),
         base::FundamentalValue(0));
   }
 }