Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

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

Issue 1920073002: Fix Chrome OS shelf locking for chromebook lid open/close. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update and add unit tests. Created 4 years, 8 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
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_SHELF_SHELF_LOCKING_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LOCKING_MANAGER_H_
6 #define ASH_SHELF_SHELF_LOCKING_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LOCKING_MANAGER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/session/session_state_observer.h" 9 #include "ash/session/session_state_observer.h"
10 #include "ash/shelf/shelf_types.h" 10 #include "ash/shelf/shelf_types.h"
11 #include "ash/shell_observer.h" 11 #include "ash/shell_observer.h"
12 #include "ash/wm/lock_state_observer.h" 12 #include "ash/wm/lock_state_observer.h"
13 13
14 namespace ash { 14 namespace ash {
15 15
16 class Shelf; 16 class Shelf;
17 17
18 // ShelfLockingManager observes screen and session events to [un]lock the shelf. 18 // ShelfLockingManager observes screen and session events to [un]lock the shelf.
19 class ASH_EXPORT ShelfLockingManager : public ShellObserver, 19 class ASH_EXPORT ShelfLockingManager : public ShellObserver,
20 public SessionStateObserver, 20 public SessionStateObserver,
21 public LockStateObserver { 21 public LockStateObserver {
22 public: 22 public:
23 explicit ShelfLockingManager(Shelf* shelf); 23 explicit ShelfLockingManager(Shelf* shelf);
24 ~ShelfLockingManager() override; 24 ~ShelfLockingManager() override;
25 25
26 bool is_locked() const { return session_locked_ || screen_locked_; }
27 void set_stored_alignment(ShelfAlignment value) { stored_alignment_ = value; }
28
26 // ShellObserver: 29 // ShellObserver:
27 void OnLockStateChanged(bool locked) override; 30 void OnLockStateChanged(bool locked) override;
28 31
29 // SessionStateObserver: 32 // SessionStateObserver:
30 void SessionStateChanged(SessionStateDelegate::SessionState state) override; 33 void SessionStateChanged(SessionStateDelegate::SessionState state) override;
31 34
32 // LockStateObserver: 35 // LockStateObserver:
33 void OnLockStateEvent(EventType event) override; 36 void OnLockStateEvent(EventType event) override;
34 37
35 private: 38 private:
36 // Update the shelf state for session and screen lock changes. 39 // Update the shelf state for session and screen lock changes.
37 void UpdateLockedState(); 40 void UpdateLockedState();
38 41
39 Shelf* shelf_; 42 Shelf* shelf_;
40 bool session_locked_ = false; 43 bool session_locked_ = false;
41 bool screen_locked_ = false; 44 bool screen_locked_ = false;
42 ShelfAlignment stored_alignment_ = SHELF_ALIGNMENT_BOTTOM; 45 ShelfAlignment stored_alignment_ = SHELF_ALIGNMENT_BOTTOM;
43 46
44 DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager); 47 DISALLOW_COPY_AND_ASSIGN(ShelfLockingManager);
45 }; 48 };
46 49
47 } // namespace ash 50 } // namespace ash
48 51
49 #endif // ASH_SHELF_SHELF_LOCKING_MANAGER_H_ 52 #endif // ASH_SHELF_SHELF_LOCKING_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_locking_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698