chrome/browser/ui/ash/session_state_delegate_chromeos.h - Issue 783663003: Special check on Supervised User creation flow added to prevent misleading shelf alignment.

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

Issue 783663003: Special check on Supervised User creation flow added to prevent misleading shelf alignment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years 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/shelf/shelf_layout_manager.cc ('K') | « chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.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 CanAddUserToMultiProfile(AddUserError* error) const override;	36 virtual bool CanAddUserToMultiProfile(AddUserError* error) const override;

37 virtual bool IsActiveUserSessionStarted() const override;	37 virtual bool IsActiveUserSessionStarted() const override;

38 virtual bool CanLockScreen() const override;	38 virtual bool CanLockScreen() const override;

39 virtual bool IsScreenLocked() const override;	39 virtual bool IsScreenLocked() const override;

40 virtual bool ShouldLockScreenBeforeSuspending() const override;	40 virtual bool ShouldLockScreenBeforeSuspending() const override;

41 virtual void LockScreen() override;	41 virtual void LockScreen() override;

42 virtual void UnlockScreen() override;	42 virtual void UnlockScreen() override;

43 virtual bool IsUserSessionBlocked() const override;	43 virtual bool IsUserSessionBlocked() const override;

	44 virtual bool IsInSupervisedUserCreationFlow() const override;

	45 virtual void SetIsInSupervisedUserCreationFlow(bool is_in_flow) override;

44 virtual SessionState GetSessionState() const override;	46 virtual SessionState GetSessionState() const override;

45 virtual const user_manager::UserInfo* GetUserInfo(	47 virtual const user_manager::UserInfo* GetUserInfo(

46 ash::MultiProfileIndex index) const override;	48 ash::MultiProfileIndex index) const override;

47 virtual const user_manager::UserInfo* GetUserInfo(	49 virtual const user_manager::UserInfo* GetUserInfo(

48 content::BrowserContext* context) const override;	50 content::BrowserContext* context) const override;

49 virtual bool ShouldShowAvatar(aura::Window* window) const override;	51 virtual bool ShouldShowAvatar(aura::Window* window) const override;

50 virtual void SwitchActiveUser(const std::string& user_id) override;	52 virtual void SwitchActiveUser(const std::string& user_id) override;

51 virtual void CycleActiveUser(CycleUser cycle_user) override;	53 virtual void CycleActiveUser(CycleUser cycle_user) override;

52 virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;	54 virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;

53 virtual void AddSessionStateObserver(	55 virtual void AddSessionStateObserver(

(...skipping 26 matching lines...) Expand all Loading...
80 // Switches to a new user. This call might show a dialog asking the user if he	82 // Switches to a new user. This call might show a dialog asking the user if he

81 // wants to stop desktop casting before switching.	83 // wants to stop desktop casting before switching.

82 void TryToSwitchUser(const std::string& user_id);	84 void TryToSwitchUser(const std::string& user_id);

83	85

84 // List of observers is only used on Chrome OS for now.	86 // List of observers is only used on Chrome OS for now.

85 ObserverList<ash::SessionStateObserver> session_state_observer_list_;	87 ObserverList<ash::SessionStateObserver> session_state_observer_list_;

86	88

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

88 SessionState session_state_;	90 SessionState session_state_;

89	91

	92 // Whether supervised user creation is running.

	93 bool is_in_supervised_creation_flow_;

	94

90 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);	95 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);

91 };	96 };

92	97

93 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_	98 #endif // CHROME_BROWSER_UI_ASH_SESSION_STATE_DELEGATE_CHROMEOS_H_

OLD	NEW