| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/wm/lock_state_controller.h" | 5 #include "ash/wm/lock_state_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 Shell::GetPrimaryRootWindow()->GetHost()->AddObserver(this); | 96 Shell::GetPrimaryRootWindow()->GetHost()->AddObserver(this); |
| 97 } | 97 } |
| 98 | 98 |
| 99 LockStateController::~LockStateController() { | 99 LockStateController::~LockStateController() { |
| 100 // TODO(jdufault): Remove after resolving crbug.com/452599. | 100 // TODO(jdufault): Remove after resolving crbug.com/452599. |
| 101 VLOG(0) << "Destroying LockStateController instance " << this; | 101 VLOG(0) << "Destroying LockStateController instance " << this; |
| 102 Shell::GetPrimaryRootWindow()->GetHost()->RemoveObserver(this); | 102 Shell::GetPrimaryRootWindow()->GetHost()->RemoveObserver(this); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void LockStateController::SetDelegate( | 105 void LockStateController::SetDelegate( |
| 106 scoped_ptr<LockStateControllerDelegate> delegate) { | 106 std::unique_ptr<LockStateControllerDelegate> delegate) { |
| 107 delegate_ = std::move(delegate); | 107 delegate_ = std::move(delegate); |
| 108 } | 108 } |
| 109 | 109 |
| 110 void LockStateController::AddObserver(LockStateObserver* observer) { | 110 void LockStateController::AddObserver(LockStateObserver* observer) { |
| 111 observers_.AddObserver(observer); | 111 observers_.AddObserver(observer); |
| 112 } | 112 } |
| 113 | 113 |
| 114 void LockStateController::RemoveObserver(LockStateObserver* observer) { | 114 void LockStateController::RemoveObserver(LockStateObserver* observer) { |
| 115 observers_.RemoveObserver(observer); | 115 observers_.RemoveObserver(observer); |
| 116 } | 116 } |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 if (unlocked_properties_.get() && | 636 if (unlocked_properties_.get() && |
| 637 unlocked_properties_->background_is_hidden) { | 637 unlocked_properties_->background_is_hidden) { |
| 638 animation_sequence->StartAnimation( | 638 animation_sequence->StartAnimation( |
| 639 SessionStateAnimator::DESKTOP_BACKGROUND, | 639 SessionStateAnimator::DESKTOP_BACKGROUND, |
| 640 SessionStateAnimator::ANIMATION_FADE_OUT, | 640 SessionStateAnimator::ANIMATION_FADE_OUT, |
| 641 speed); | 641 speed); |
| 642 } | 642 } |
| 643 } | 643 } |
| 644 | 644 |
| 645 } // namespace ash | 645 } // namespace ash |
| OLD | NEW |