OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/session_state_controller_impl2.h" | 5 #include "ash/wm/session_state_controller_impl2.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "ash/test/test_shell_delegate.h" | 10 #include "ash/test/test_shell_delegate.h" |
11 #include "ash/wm/cursor_manager.h" | 11 #include "ash/wm/cursor_manager.h" |
12 #include "ash/wm/power_button_controller.h" | 12 #include "ash/wm/power_button_controller.h" |
13 #include "ash/wm/session_state_animator.h" | 13 #include "ash/wm/session_state_animator.h" |
14 #include "ash/wm/session_state_controller.h" | 14 #include "ash/wm/session_state_controller.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/time.h" | 17 #include "base/time.h" |
18 #include "ui/aura/env.h" | 18 #include "ui/aura/env.h" |
19 #include "ui/aura/root_window.h" | 19 #include "ui/aura/root_window.h" |
20 #include "ui/aura/test/event_generator.h" | 20 #include "ui/aura/test/event_generator.h" |
21 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
22 #include "ui/gfx/size.h" | 22 #include "ui/gfx/size.h" |
23 | 23 |
24 namespace ash { | 24 namespace ash { |
25 namespace test { | 25 namespace test { |
26 namespace { | 26 namespace { |
27 bool cursor_visible() { | 27 bool cursor_visible() { |
28 return ash::Shell::GetInstance()->cursor_manager()->cursor_visible(); | 28 return ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible(); |
29 } | 29 } |
30 | 30 |
31 void CheckCalledCallback(bool* flag) { | 31 void CheckCalledCallback(bool* flag) { |
32 (*flag) = true; | 32 (*flag) = true; |
33 } | 33 } |
34 } | 34 } |
35 | 35 |
36 // Fake implementation of PowerButtonControllerDelegate that just logs requests | 36 // Fake implementation of PowerButtonControllerDelegate that just logs requests |
37 // to lock the screen and shut down the device. | 37 // to lock the screen and shut down the device. |
38 class TestSessionStateControllerDelegate : | 38 class TestSessionStateControllerDelegate : |
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 | 609 |
610 // After increasing the brightness to 10%, we should start the timer like | 610 // After increasing the brightness to 10%, we should start the timer like |
611 // usual. | 611 // usual. |
612 controller_->OnScreenBrightnessChanged(10.0); | 612 controller_->OnScreenBrightnessChanged(10.0); |
613 controller_->OnPowerButtonEvent(true, base::TimeTicks::Now()); | 613 controller_->OnPowerButtonEvent(true, base::TimeTicks::Now()); |
614 EXPECT_TRUE(test_api_->lock_timer_is_running()); | 614 EXPECT_TRUE(test_api_->lock_timer_is_running()); |
615 } | 615 } |
616 | 616 |
617 } // namespace test | 617 } // namespace test |
618 } // namespace ash | 618 } // namespace ash |
OLD | NEW |