chrome/browser/ui/ash/session_state_delegate_chromeos.h - Issue 560033002: Fixed suggesting adding more users into multi-profile session when we don't have more

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

Issue 560033002: Fixed suggesting adding more users into multi-profile session when we don't have more (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update after review Created 6 years, 3 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

« ash/session/session_state_delegate.h ('K') | « ash/system/user/user_view.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('j') | chrome/browser/ui/ash/session_state_delegate_chromeos.cc » ('J')
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 15 matching lines...) Expand all Loading...
26 SessionStateDelegateChromeos();	26 SessionStateDelegateChromeos();

27 virtual ~SessionStateDelegateChromeos();	27 virtual ~SessionStateDelegateChromeos();

28	28

29 // ash::SessionStateDelegate:	29 // ash::SessionStateDelegate:

30 virtual content::BrowserContext* GetBrowserContextByIndex(	30 virtual content::BrowserContext* GetBrowserContextByIndex(

31 ash::MultiProfileIndex index) OVERRIDE;	31 ash::MultiProfileIndex index) OVERRIDE;

32 virtual content::BrowserContext* GetBrowserContextForWindow(	32 virtual content::BrowserContext* GetBrowserContextForWindow(

33 aura::Window* window) OVERRIDE;	33 aura::Window* window) OVERRIDE;

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 CanAddUserToMultiProfile(

	37 MultiProfileAddUserError* error) const OVERRIDE;

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

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

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

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

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

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

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

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

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

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

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 // List of observers is only used on Chrome OS for now.	85 // List of observers is only used on Chrome OS for now.

84 ObserverList<ash::SessionStateObserver> session_state_observer_list_;	86 ObserverList<ash::SessionStateObserver> session_state_observer_list_;

85	87

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

87 SessionState session_state_;	89 SessionState session_state_;

88	90

89 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);	91 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);

90 };	92 };

91	93

92 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_	94 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_

OLD	NEW