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

Unified Diff: ash/common/shelf/shelf_locking_manager.cc

Issue 2734653002: chromeos: Move files in //ash/common to //ash (Closed)
Patch Set: fix a11y tests, fix docs Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_locking_manager.h ('k') | ash/common/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_locking_manager.cc
diff --git a/ash/common/shelf/shelf_locking_manager.cc b/ash/common/shelf/shelf_locking_manager.cc
deleted file mode 100644
index aabc1450adf76c72180e77a7fd6825f3ee60e0a6..0000000000000000000000000000000000000000
--- a/ash/common/shelf/shelf_locking_manager.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/common/shelf/shelf_locking_manager.h"
-
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm_shell.h"
-
-namespace ash {
-
-ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) : shelf_(shelf) {
- WmShell::Get()->AddLockStateObserver(this);
- SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
- session_locked_ =
- delegate->GetSessionState() != session_manager::SessionState::ACTIVE;
- screen_locked_ = delegate->IsScreenLocked();
- delegate->AddSessionStateObserver(this);
- WmShell::Get()->AddShellObserver(this);
-}
-
-ShelfLockingManager::~ShelfLockingManager() {
- WmShell::Get()->RemoveLockStateObserver(this);
- WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
- WmShell::Get()->RemoveShellObserver(this);
-}
-
-void ShelfLockingManager::OnLockStateChanged(bool locked) {
- screen_locked_ = locked;
- UpdateLockedState();
-}
-
-void ShelfLockingManager::SessionStateChanged(
- session_manager::SessionState state) {
- session_locked_ = state != session_manager::SessionState::ACTIVE;
- UpdateLockedState();
-}
-
-void ShelfLockingManager::OnLockStateEvent(EventType event) {
- // Lock when the animation starts, ignoring pre-lock. There's no unlock event.
- screen_locked_ |= event == EVENT_LOCK_ANIMATION_STARTED;
- UpdateLockedState();
-}
-
-void ShelfLockingManager::UpdateLockedState() {
- const ShelfAlignment alignment = shelf_->GetAlignment();
- if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {
- stored_alignment_ = alignment;
- shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);
- } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {
- shelf_->SetAlignment(stored_alignment_);
- }
-}
-
-} // namespace ash
« no previous file with comments | « ash/common/shelf/shelf_locking_manager.h ('k') | ash/common/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698