chrome/browser/chromeos/login/ui/webui_login_display.h - Issue 1165323004: We should use UserID object to identify users instead of username.

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.h

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.cc ('K') | « chrome/browser/chromeos/login/ui/views/user_board_view.h ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/webui_login_display.h

diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h

index 6cc25fb282f3e50bf065743b22a9915b60e672de..cbc261a1208c695da0f98b50809d1dc6934200d2 100644

--- a/chrome/browser/chromeos/login/ui/webui_login_display.h

+++ b/chrome/browser/chromeos/login/ui/webui_login_display.h

@@ -35,16 +35,16 @@ class WebUILoginDisplay : public LoginDisplay,

bool show_users,

bool show_new_user) override;

void OnPreferencesChanged() override;

- void RemoveUser(const std::string& user_id) override;

+ void RemoveUser(const user_manager::UserID& user_id) override;

void SetUIEnabled(bool is_enabled) override;

void ShowError(int error_msg_id,

int login_attempts,

HelpAppLauncher::HelpTopic help_topic_id) override;

void ShowErrorScreen(LoginDisplay::SigninError error_id) override;

- void ShowGaiaPasswordChanged(const std::string& username) override;

+ void ShowGaiaPasswordChanged(const user_manager::UserID& user_id) override;

void ShowPasswordChangedDialog(bool show_password_error,

- const std::string& email) override;

- void ShowSigninUI(const std::string& email) override;

+ const user_manager::UserID& user_id) override;

+ void ShowSigninUI(const user_manager::UserID& user_id) override;

void ShowWhitelistCheckFailedError() override;

// NativeWindowDelegate implementation:

@@ -64,7 +64,7 @@ class WebUILoginDisplay : public LoginDisplay,

void OnSigninScreenReady() override;

void CancelUserAdding() override;

- void LoadWallpaper(const std::string& username) override;

+ void LoadWallpaper(const user_manager::UserID& user_id) override;

void LoadSigninWallpaper() override;

void ShowEnterpriseEnrollmentScreen() override;

void ShowEnableDebuggingScreen() override;

@@ -72,7 +72,7 @@ class WebUILoginDisplay : public LoginDisplay,

void ShowKioskAutolaunchScreen() override;

void ShowWrongHWIDScreen() override;

void SetWebUIHandler(LoginDisplayWebUIHandler* webui_handler) override;

- virtual void ShowSigninScreenForCreds(const std::string& username,

+ virtual void ShowSigninScreenForCreds(const user_manager::UserID& user_id,

const std::string& password);

bool IsShowGuest() const override;

bool IsShowUsers() const override;

@@ -80,7 +80,7 @@ class WebUILoginDisplay : public LoginDisplay,

void SetDisplayEmail(const std::string& email) override;

void HandleGetUsers() override;

- void CheckUserStatus(const std::string& user_id) override;

+ void CheckUserStatus(const user_manager::UserID& user_id) override;

const user_manager::UserList& GetUsers() const override;

// ui::UserActivityDetector implementation: