| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 shell->cursor_manager()->LockCursor(); | 168 shell->cursor_manager()->LockCursor(); |
| 169 } | 169 } |
| 170 | 170 |
| 171 animator_->StartAnimation( | 171 animator_->StartAnimation( |
| 172 SessionStateAnimator::ROOT_CONTAINER, | 172 SessionStateAnimator::ROOT_CONTAINER, |
| 173 SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, | 173 SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, |
| 174 SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); | 174 SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); |
| 175 StartRealShutdownTimer(true); | 175 StartRealShutdownTimer(true); |
| 176 } | 176 } |
| 177 | 177 |
| 178 void LockStateController::OnLockScreenHide( | 178 void LockStateController::OnLockScreenHide(base::Closure callback) { |
| 179 base::Callback<void(void)>& callback) { | |
| 180 StartUnlockAnimationBeforeUIDestroyed(callback); | 179 StartUnlockAnimationBeforeUIDestroyed(callback); |
| 181 } | 180 } |
| 182 | 181 |
| 183 void LockStateController::SetLockScreenDisplayedCallback( | 182 void LockStateController::SetLockScreenDisplayedCallback( |
| 184 const base::Closure& callback) { | 183 const base::Closure& callback) { |
| 185 lock_screen_displayed_callback_ = callback; | 184 lock_screen_displayed_callback_ = callback; |
| 186 } | 185 } |
| 187 | 186 |
| 188 void LockStateController::OnHostCloseRequested( | 187 void LockStateController::OnHostCloseRequested( |
| 189 const aura::WindowTreeHost* host) { | 188 const aura::WindowTreeHost* host) { |
| (...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 SessionStateAnimator::AnimationSpeed speed, | 551 SessionStateAnimator::AnimationSpeed speed, |
| 553 SessionStateAnimator::AnimationSequence* animation_sequence) { | 552 SessionStateAnimator::AnimationSequence* animation_sequence) { |
| 554 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { | 553 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { |
| 555 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, | 554 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, |
| 556 SessionStateAnimator::ANIMATION_FADE_OUT, | 555 SessionStateAnimator::ANIMATION_FADE_OUT, |
| 557 speed); | 556 speed); |
| 558 } | 557 } |
| 559 } | 558 } |
| 560 | 559 |
| 561 } // namespace ash | 560 } // namespace ash |
| OLD | NEW |