Chromium Code Reviews| 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 #include "ash/shelf/shelf_locking_manager.h" | 5 #include "ash/shelf/shelf_locking_manager.h" |
| 6 | 6 |
| 7 #include "ash/session/session_controller.h" | 7 #include "ash/session/session_controller.h" |
| 8 #include "ash/shelf/wm_shelf.h" | 8 #include "ash/shelf/wm_shelf.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_port.h" | 10 #include "ash/shell_port.h" |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 | 13 |
| 14 ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) | 14 ShelfLockingManager::ShelfLockingManager(WmShelf* shelf) |
| 15 : shelf_(shelf), | 15 : shelf_(shelf), |
| 16 stored_alignment_(shelf->GetAlignment()), | 16 stored_alignment_(SHELF_ALIGNMENT_BOTTOM_LOCKED), |
|
James Cook
2017/05/16 21:32:35
This is to avoid reading out of a partially-constr
msw
2017/05/16 22:42:00
Acknowledged.
| |
| 17 scoped_session_observer_(this) { | 17 scoped_session_observer_(this) { |
| 18 DCHECK(shelf_); | 18 DCHECK(shelf_); |
| 19 ShellPort::Get()->AddLockStateObserver(this); | 19 ShellPort::Get()->AddLockStateObserver(this); |
| 20 SessionController* controller = Shell::Get()->session_controller(); | 20 SessionController* controller = Shell::Get()->session_controller(); |
| 21 session_locked_ = | 21 session_locked_ = |
| 22 controller->GetSessionState() != session_manager::SessionState::ACTIVE; | 22 controller->GetSessionState() != session_manager::SessionState::ACTIVE; |
| 23 screen_locked_ = controller->IsScreenLocked(); | 23 screen_locked_ = controller->IsScreenLocked(); |
| 24 } | 24 } |
| 25 | 25 |
| 26 ShelfLockingManager::~ShelfLockingManager() { | 26 ShelfLockingManager::~ShelfLockingManager() { |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 48 const ShelfAlignment alignment = shelf_->GetAlignment(); | 48 const ShelfAlignment alignment = shelf_->GetAlignment(); |
| 49 if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) { | 49 if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
| 50 stored_alignment_ = alignment; | 50 stored_alignment_ = alignment; |
| 51 shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED); | 51 shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED); |
| 52 } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) { | 52 } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) { |
| 53 shelf_->SetAlignment(stored_alignment_); | 53 shelf_->SetAlignment(stored_alignment_); |
| 54 } | 54 } |
| 55 } | 55 } |
| 56 | 56 |
| 57 } // namespace ash | 57 } // namespace ash |
| OLD | NEW |