chrome/browser/chromeos/login/ui/webui_login_display.h - Issue 398753004: [cros] Move User class to user_manager component.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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

« no previous file with comments | « chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_display.cc » ('j') | no next file with comments »
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 9031d561a1d30578b39146763ffdf6a70e61244b..bdcb0fd9aff080d2d940bdbf8017ff33e15404e4 100644

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

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

@@ -13,9 +13,9 @@

#include "chrome/browser/chromeos/login/screens/user_selection_screen.h"

#include "chrome/browser/chromeos/login/signin_specifics.h"

#include "chrome/browser/chromeos/login/ui/login_display.h"

-#include "chrome/browser/chromeos/login/users/user.h"

#include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"

#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

+#include "components/user_manager/user.h"

#include "ui/views/widget/widget.h"

#include "ui/wm/core/user_activity_observer.h"

@@ -31,13 +31,13 @@ class WebUILoginDisplay : public LoginDisplay,

// LoginDisplay implementation:

virtual void ClearAndEnablePassword() OVERRIDE;

- virtual void Init(const UserList& users,

+ virtual void Init(const user_manager::UserList& users,

bool show_guest,

bool show_users,

bool show_new_user) OVERRIDE;

virtual void OnPreferencesChanged() OVERRIDE;

virtual void OnBeforeUserRemoved(const std::string& username) OVERRIDE;

- virtual void OnUserImageChanged(const User& user) OVERRIDE;

+ virtual void OnUserImageChanged(const user_manager::User& user) OVERRIDE;

virtual void OnUserRemoved(const std::string& username) OVERRIDE;

virtual void SetUIEnabled(bool is_enabled) OVERRIDE;

virtual void ShowError(int error_msg_id,

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

LoginDisplayWebUIHandler* webui_handler) OVERRIDE;

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

const std::string& password);

- virtual const UserList& GetUsers() const OVERRIDE;

+ virtual const user_manager::UserList& GetUsers() const OVERRIDE;

virtual bool IsShowGuest() const OVERRIDE;

virtual bool IsShowUsers() const OVERRIDE;

virtual bool IsUserSigninCompleted() const OVERRIDE;