ash/common/shelf/shelf_locking_manager.h - Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate

Side by Side Diff

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

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

Side by Side Diff: ash/common/shelf/shelf_locking_manager.h

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)

Patch Set: rebase Created 3 years, 9 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/common/session/session_controller.cc ('K') | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_locking_manager.cc » ('j') | ash/common/test/test_session_controller_client.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_	5 #ifndef ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_

6 #define ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_	6 #define ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_

7	7

8 #include "ash/ash_export.h"	8 #include "ash/ash_export.h"

9 #include "ash/common/session/session_state_observer.h"	9 #include "ash/common/session/session_state_observer.h"

10 #include "ash/common/shell_observer.h"	10 #include "ash/common/shell_observer.h"

(...skipping 24 matching lines...) Expand all Loading...
35 // LockStateObserver:	35 // LockStateObserver:

36 void OnLockStateEvent(EventType event) override;	36 void OnLockStateEvent(EventType event) override;

37	37

38 private:	38 private:

39 // Update the shelf state for session and screen lock changes.	39 // Update the shelf state for session and screen lock changes.

40 void UpdateLockedState();	40 void UpdateLockedState();

41	41

42 WmShelf* shelf_;	42 WmShelf* shelf_;

43 bool session_locked_ = false;	43 bool session_locked_ = false;

44 bool screen_locked_ = false;	44 bool screen_locked_ = false;

45 ShelfAlignment stored_alignment_ = SHELF_ALIGNMENT_BOTTOM;	45 ShelfAlignment stored_alignment_;

46	46

47 DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager);	47 DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager);

48 };	48 };

49	49

50 } // namespace ash	50 } // namespace ash

51	51

52 #endif // ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_	52 #endif // ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_

OLD	NEW