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

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

Issue 230763004: Split ui/display types into separate module and have Ozone depend on it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 8 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
« no previous file with comments | « ash/test/display_manager_test_api.h ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/session_state_delegate.h" 8 #include "ash/session_state_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 10 matching lines...) Expand all
21 #include "ui/aura/window_event_dispatcher.h" 21 #include "ui/aura/window_event_dispatcher.h"
22 #include "ui/compositor/layer_animator.h" 22 #include "ui/compositor/layer_animator.h"
23 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 23 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
24 #include "ui/compositor/scoped_layer_animation_settings.h" 24 #include "ui/compositor/scoped_layer_animation_settings.h"
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
26 #include "ui/gfx/size.h" 26 #include "ui/gfx/size.h"
27 27
28 #if defined(OS_CHROMEOS) 28 #if defined(OS_CHROMEOS)
29 #include "ui/display/chromeos/display_configurator.h" 29 #include "ui/display/chromeos/display_configurator.h"
30 #include "ui/display/chromeos/test/test_display_snapshot.h" 30 #include "ui/display/chromeos/test/test_display_snapshot.h"
31 #include "ui/display/display_constants.h" 31 #include "ui/display/types/display_constants.h"
32 #endif 32 #endif
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 #include "base/win/windows_version.h" 35 #include "base/win/windows_version.h"
36 #endif 36 #endif
37 37
38 namespace ash { 38 namespace ash {
39 namespace test { 39 namespace test {
40 namespace { 40 namespace {
41 41
(...skipping 1068 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 1110
1111 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS); 1111 Advance(SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS);
1112 ExpectUnlockAfterUIDestroyedAnimationFinished(); 1112 ExpectUnlockAfterUIDestroyedAnimationFinished();
1113 EXPECT_TRUE(IsBackgroundHidden()); 1113 EXPECT_TRUE(IsBackgroundHidden());
1114 1114
1115 ExpectUnlockedState(); 1115 ExpectUnlockedState();
1116 } 1116 }
1117 1117
1118 } // namespace test 1118 } // namespace test
1119 } // namespace ash 1119 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/display_manager_test_api.h ('k') | ash/wm/power_button_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698