This CL replaces e-mail with AccountId on user selection screen.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 301 matching lines @@
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   void UpdateAddButtonStatus();
 
   // Restore input focus to current user pod.
   void RefocusCurrentPod();
 
   // WebUI message handlers.
   void HandleGetUsers();
-  void HandleAuthenticateUser(const std::string& username,
+  void HandleAuthenticateUser(const std::string& user_id,
                               const std::string& password);
   void HandleAttemptUnlock(const std::string& username);
   void HandleLaunchIncognito();
   void HandleLaunchPublicSession(const std::string& user_id,
                                  const std::string& locale,
                                  const std::string& input_method);
   void HandleOfflineLogin(const base::ListValue* args);
   void HandleShutdownSystem();
   void HandleLoadWallpaper(const std::string& email);
   void HandleRebootSystem();
@@ skipping 19 matching lines @@
   void HandleShowLoadingTimeoutError();
   void HandleShowSupervisedUserCreationScreen();
   void HandleFocusPod(const std::string& user_id);
   void HandleHardlockPod(const std::string& user_id);
   void HandleLaunchKioskApp(const std::string& app_id, bool diagnostic_mode);
   void HandleGetPublicSessionKeyboardLayouts(const std::string& user_id,
                                              const std::string& locale);
   void HandleCancelConsumerManagementEnrollment();
   void HandleGetTouchViewState();
   void HandleLogRemoveUserWarningShown();
-  void HandleFirstIncorrectPasswordAttempt(const std::string& email);
-  void HandleMaxIncorrectPasswordAttempts(const std::string& email);
+  void HandleFirstIncorrectPasswordAttempt(const std::string& user_id);
+  void HandleMaxIncorrectPasswordAttempts(const std::string& user_id);
 
   // Sends the list of |keyboard_layouts| available for the |locale| that is
   // currently selected for the public session identified by |user_id|.
   void SendPublicSessionKeyboardLayouts(
-      const std::string& user_id,
+      const AccountId& account_id,
       const std::string& locale,
       scoped_ptr<base::ListValue> keyboard_layouts);
 
   // Returns true iff
   // (i)   log in is restricted to some user list,
   // (ii)  all users in the restricted list are present.
   bool AllWhitelistedUsersPresent();
 
   // Cancels password changed flow - switches back to login screen.
   // Called as a callback after cookies are cleared.
@@ skipping 108 matching lines @@
   scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;
 
   base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_