chrome/browser/ui/ash/session_state_delegate_chromeos.h - Issue 379803004: Move UserInfo to user_manager.

Side by Side Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.h

Issue 379803004: Move UserInfo to user_manager. (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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_	5 #ifndef CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_

6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_	6 #define CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_

7	7

8 #include "ash/session/session_state_delegate.h"	8 #include "ash/session/session_state_delegate.h"

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/compiler_specific.h"	10 #include "base/compiler_specific.h"

(...skipping 23 matching lines...) Expand all Loading...
34 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;	34 virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;

35 virtual int NumberOfLoggedInUsers() const OVERRIDE;	35 virtual int NumberOfLoggedInUsers() const OVERRIDE;

36 virtual bool IsActiveUserSessionStarted() const OVERRIDE;	36 virtual bool IsActiveUserSessionStarted() const OVERRIDE;

37 virtual bool CanLockScreen() const OVERRIDE;	37 virtual bool CanLockScreen() const OVERRIDE;

38 virtual bool IsScreenLocked() const OVERRIDE;	38 virtual bool IsScreenLocked() const OVERRIDE;

39 virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE;	39 virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE;

40 virtual void LockScreen() OVERRIDE;	40 virtual void LockScreen() OVERRIDE;

41 virtual void UnlockScreen() OVERRIDE;	41 virtual void UnlockScreen() OVERRIDE;

42 virtual bool IsUserSessionBlocked() const OVERRIDE;	42 virtual bool IsUserSessionBlocked() const OVERRIDE;

43 virtual SessionState GetSessionState() const OVERRIDE;	43 virtual SessionState GetSessionState() const OVERRIDE;

44 virtual const ash::UserInfo* GetUserInfo(	44 virtual const user_manager::UserInfo* GetUserInfo(

45 ash::MultiProfileIndex index) const OVERRIDE;	45 ash::MultiProfileIndex index) const OVERRIDE;

46 virtual const ash::UserInfo* GetUserInfo(	46 virtual const user_manager::UserInfo* GetUserInfo(

47 content::BrowserContext* context) const OVERRIDE;	47 content::BrowserContext* context) const OVERRIDE;

48 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;	48 virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;

49 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;	49 virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;

50 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;	50 virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;

51 virtual void AddSessionStateObserver(	51 virtual void AddSessionStateObserver(

52 ash::SessionStateObserver* observer) OVERRIDE;	52 ash::SessionStateObserver* observer) OVERRIDE;

53 virtual void RemoveSessionStateObserver(	53 virtual void RemoveSessionStateObserver(

54 ash::SessionStateObserver* observer) OVERRIDE;	54 ash::SessionStateObserver* observer) OVERRIDE;

55	55

56 // chromeos::LoginState::Observer overrides.	56 // chromeos::LoginState::Observer overrides.

(...skipping 19 matching lines...) Expand all Loading...
76 // List of observers is only used on Chrome OS for now.	76 // List of observers is only used on Chrome OS for now.

77 ObserverList<ash::SessionStateObserver> session_state_observer_list_;	77 ObserverList<ash::SessionStateObserver> session_state_observer_list_;

78	78

79 // Session state (e.g. login screen vs. user session).	79 // Session state (e.g. login screen vs. user session).

80 SessionState session_state_;	80 SessionState session_state_;

81	81

82 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);	82 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);

83 };	83 };

84	84

85 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_	85 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_

OLD	NEW