ChromeOS: Fix removeUser button on signin 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 17 matching lines @@
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui.h"
 #include "net/base/net_errors.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/events/event_handler.h"
 
+class AccountId;
 class EasyUnlockService;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
 
 class CaptivePortalWindowProxy;
@@ skipping 22 matching lines @@
 
   std::string email_;
   bool oobe_ui_;
 };
 
 // An interface for WebUILoginDisplay to call SigninScreenHandler.
 class LoginDisplayWebUIHandler {
  public:
   virtual void ClearAndEnablePassword() = 0;
   virtual void ClearUserPodPassword() = 0;
-  virtual void OnUserRemoved(const std::string& username,
+  virtual void OnUserRemoved(const AccountId& account_id,
                              bool last_user_removed) = 0;
   virtual void OnUserImageChanged(const user_manager::User& user) = 0;
   virtual void OnPreferencesChanged() = 0;
   virtual void ResetSigninScreenHandlerDelegate() = 0;
   virtual void ShowError(int login_attempts,
                          const std::string& error_text,
                          const std::string& help_link_text,
                          HelpAppLauncher::HelpTopic help_topic_id) = 0;
   virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) = 0;
   virtual void ShowSigninUI(const std::string& email) = 0;
@@ skipping 68 matching lines @@
   // Cancels user adding.
   virtual void CancelUserAdding() = 0;
 
   // Load wallpaper for given |username|.
   virtual void LoadWallpaper(const std::string& username) = 0;
 
   // Loads the default sign-in wallpaper.
   virtual void LoadSigninWallpaper() = 0;
 
   // Attempts to remove given user.
-  virtual void RemoveUser(const std::string& username) = 0;
+  virtual void RemoveUser(const AccountId& account_id) = 0;
 
   // Let the delegate know about the handler it is supposed to be using.
   virtual void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) = 0;
 
   // Whether login as guest is available.
   virtual bool IsShowGuest() const = 0;
 
   // Weather to show the user pods or only GAIA sign in.
   // Public sessions are always shown.
   virtual bool IsShowUsers() const = 0;
@@ skipping 98 matching lines @@
       ::login::LocalizedValuesBuilder* builder) override;
   void Initialize() override;
   gfx::NativeWindow GetNativeWindow() override;
 
   // WebUIMessageHandler implementation:
   void RegisterMessages() override;
 
   // LoginDisplayWebUIHandler implementation:
   void ClearAndEnablePassword() override;
   void ClearUserPodPassword() override;
-  void OnUserRemoved(const std::string& username,
+  void OnUserRemoved(const AccountId& account_id,
                      bool last_user_removed) override;
   void OnUserImageChanged(const user_manager::User& user) override;
   void OnPreferencesChanged() override;
   void ResetSigninScreenHandlerDelegate() override;
   void ShowError(int login_attempts,
                  const std::string& error_text,
                  const std::string& help_link_text,
                  HelpAppLauncher::HelpTopic help_topic_id) override;
   void ShowSigninUI(const std::string& email) override;
   void ShowPasswordChangedDialog(bool show_password_error,
@@ skipping 189 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_