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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
6 #include "ash/session_state_delegate.h" | 6 #include "ash/session_state_delegate.h" |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/event_types.h" | 11 #include "base/event_types.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "ui/aura/client/dispatcher_client.h" | 13 #include "ui/aura/client/dispatcher_client.h" |
14 #include "ui/aura/root_window.h" | |
15 #include "ui/aura/test/test_windows.h" | 14 #include "ui/aura/test/test_windows.h" |
16 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
| 16 #include "ui/aura/window_event_dispatcher.h" |
17 #include "ui/base/accelerators/accelerator.h" | 17 #include "ui/base/accelerators/accelerator.h" |
18 #include "ui/events/event_constants.h" | 18 #include "ui/events/event_constants.h" |
19 #include "ui/events/event_utils.h" | 19 #include "ui/events/event_utils.h" |
20 | 20 |
21 #if defined(USE_X11) | 21 #if defined(USE_X11) |
22 #include <X11/Xlib.h> | 22 #include <X11/Xlib.h> |
23 #include "ui/events/test/events_test_utils_x11.h" | 23 #include "ui/events/test/events_test_utils_x11.h" |
24 #endif // USE_X11 | 24 #endif // USE_X11 |
25 | 25 |
26 namespace ash { | 26 namespace ash { |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 DispatchKeyReleaseA(); | 147 DispatchKeyReleaseA(); |
148 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( | 148 aura::client::GetDispatcherClient(root_window)->RunWithDispatcher( |
149 &inner_dispatcher, | 149 &inner_dispatcher, |
150 root_window); | 150 root_window); |
151 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); | 151 EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched()); |
152 EXPECT_EQ(1, target.accelerator_pressed_count()); | 152 EXPECT_EQ(1, target.accelerator_pressed_count()); |
153 } | 153 } |
154 | 154 |
155 } // namespace test | 155 } // namespace test |
156 } // namespace ash | 156 } // namespace ash |
OLD | NEW |