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

Side by Side Diff: ash/wm/lock_state_controller.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 8
9 #include "ash/accessibility_delegate.h" 9 #include "ash/accessibility_delegate.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/cancel_mode.h" 11 #include "ash/cancel_mode.h"
12 #include "ash/metrics/user_metrics_recorder.h" 12 #include "ash/metrics/user_metrics_recorder.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "ash/shell_delegate.h" 14 #include "ash/shell_delegate.h"
15 #include "ash/shell_window_ids.h" 15 #include "ash/shell_window_ids.h"
16 #include "ash/wm/session_state_animator.h" 16 #include "ash/wm/session_state_animator.h"
17 #include "base/bind_helpers.h" 17 #include "base/bind_helpers.h"
18 #include "base/command_line.h" 18 #include "base/command_line.h"
19 #include "base/timer/timer.h" 19 #include "base/timer/timer.h"
20 #include "ui/aura/window_event_dispatcher.h" 20 #include "ui/aura/window_event_dispatcher.h"
21 #include "ui/compositor/layer_animation_sequence.h" 21 #include "ui/compositor/layer_animation_sequence.h"
22 #include "ui/compositor/scoped_layer_animation_settings.h" 22 #include "ui/compositor/scoped_layer_animation_settings.h"
23 #include "ui/views/corewm/compound_event_filter.h" 23 #include "ui/wm/core/compound_event_filter.h"
24 24
25 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
26 #include "base/sys_info.h" 26 #include "base/sys_info.h"
27 #include "media/audio/sounds/sounds_manager.h" 27 #include "media/audio/sounds/sounds_manager.h"
28 #endif 28 #endif
29 29
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 using media::SoundsManager; 31 using media::SoundsManager;
32 #endif 32 #endif
33 33
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 unlocked_properties_->background_is_hidden) { 674 unlocked_properties_->background_is_hidden) {
675 animator_->StartAnimationWithObserver( 675 animator_->StartAnimationWithObserver(
676 internal::SessionStateAnimator::DESKTOP_BACKGROUND, 676 internal::SessionStateAnimator::DESKTOP_BACKGROUND,
677 internal::SessionStateAnimator::ANIMATION_FADE_OUT, 677 internal::SessionStateAnimator::ANIMATION_FADE_OUT,
678 speed, 678 speed,
679 observer); 679 observer);
680 } 680 }
681 } 681 }
682 682
683 } // namespace ash 683 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/immersive_fullscreen_controller.cc ('k') | ash/wm/maximize_mode/workspace_backdrop_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698