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

Unified Diff: ash/shelf/shelf_locking_manager.cc

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 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
Index: ash/shelf/shelf_locking_manager.cc
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/shelf/shelf_locking_manager.cc
deleted file mode 100644
index 62f27e497a2d4d37cdac8100a2b010d53ccb78bb..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_locking_manager.cc
+++ /dev/null
@@ -1,59 +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/shelf/shelf_locking_manager.h"
-
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf.h"
-#include "ash/shell.h"
-#include "ash/wm/lock_state_controller.h"
-
-namespace ash {
-
-ShelfLockingManager::ShelfLockingManager(Shelf* shelf) : shelf_(shelf) {
- Shell* shell = Shell::GetInstance();
- shell->lock_state_controller()->AddObserver(this);
- SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
- session_locked_ =
- delegate->GetSessionState() != SessionStateDelegate::SESSION_STATE_ACTIVE;
- screen_locked_ = delegate->IsScreenLocked();
- delegate->AddSessionStateObserver(this);
- WmShell::Get()->AddShellObserver(this);
-}
-
-ShelfLockingManager::~ShelfLockingManager() {
- Shell::GetInstance()->lock_state_controller()->RemoveObserver(this);
- WmShell::Get()->GetSessionStateDelegate()->RemoveSessionStateObserver(this);
- WmShell::Get()->RemoveShellObserver(this);
-}
-
-void ShelfLockingManager::OnLockStateChanged(bool locked) {
- screen_locked_ = locked;
- UpdateLockedState();
-}
-
-void ShelfLockingManager::SessionStateChanged(
- SessionStateDelegate::SessionState state) {
- session_locked_ = state != SessionStateDelegate::SESSION_STATE_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_->alignment();
- 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

Powered by Google App Engine
This is Rietveld 408576698