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 |
11 #include "ash/cancel_mode.h" | 11 #include "ash/cancel_mode.h" |
12 #include "ash/common/accessibility_delegate.h" | 12 #include "ash/common/accessibility_delegate.h" |
13 #include "ash/common/shell_delegate.h" | 13 #include "ash/common/shell_delegate.h" |
14 #include "ash/common/shell_window_ids.h" | |
15 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 15 #include "ash/public/cpp/shell_window_ids.h" |
16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
17 #include "ash/wm/session_state_animator.h" | 17 #include "ash/wm/session_state_animator.h" |
18 #include "ash/wm/session_state_animator_impl.h" | 18 #include "ash/wm/session_state_animator_impl.h" |
19 #include "base/bind.h" | 19 #include "base/bind.h" |
20 #include "base/bind_helpers.h" | 20 #include "base/bind_helpers.h" |
21 #include "base/command_line.h" | 21 #include "base/command_line.h" |
22 #include "base/location.h" | 22 #include "base/location.h" |
23 #include "base/logging.h" | 23 #include "base/logging.h" |
24 #include "base/metrics/histogram_macros.h" | 24 #include "base/metrics/histogram_macros.h" |
25 #include "base/strings/string_util.h" | 25 #include "base/strings/string_util.h" |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 SessionStateAnimator::AnimationSpeed speed, | 576 SessionStateAnimator::AnimationSpeed speed, |
577 SessionStateAnimator::AnimationSequence* animation_sequence) { | 577 SessionStateAnimator::AnimationSequence* animation_sequence) { |
578 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { | 578 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { |
579 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, | 579 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, |
580 SessionStateAnimator::ANIMATION_FADE_OUT, | 580 SessionStateAnimator::ANIMATION_FADE_OUT, |
581 speed); | 581 speed); |
582 } | 582 } |
583 } | 583 } |
584 | 584 |
585 } // namespace ash | 585 } // namespace ash |
OLD | NEW |