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 <X11/keysym.h> | 5 #include <X11/keysym.h> |
6 #include <X11/Xlib.h> | 6 #include <X11/Xlib.h> |
7 | 7 |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "ui/aura/client/screen_position_client.h" | 9 #include "ui/aura/client/screen_position_client.h" |
10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
11 #include "ui/aura/root_window.h" | |
12 #include "ui/aura/test/ui_controls_factory_aura.h" | 11 #include "ui/aura/test/ui_controls_factory_aura.h" |
13 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/aura/window_event_dispatcher.h" |
14 #include "ui/base/test/ui_controls_aura.h" | 14 #include "ui/base/test/ui_controls_aura.h" |
15 #include "ui/base/x/x11_util.h" | 15 #include "ui/base/x/x11_util.h" |
16 #include "ui/compositor/dip_util.h" | 16 #include "ui/compositor/dip_util.h" |
17 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 17 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
18 | 18 |
19 namespace aura { | 19 namespace aura { |
20 namespace test { | 20 namespace test { |
21 namespace { | 21 namespace { |
22 | 22 |
23 using ui_controls::DOWN; | 23 using ui_controls::DOWN; |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
256 }; | 256 }; |
257 | 257 |
258 } // namespace | 258 } // namespace |
259 | 259 |
260 UIControlsAura* CreateUIControlsAura(WindowEventDispatcher* dispatcher) { | 260 UIControlsAura* CreateUIControlsAura(WindowEventDispatcher* dispatcher) { |
261 return new UIControlsX11(dispatcher); | 261 return new UIControlsX11(dispatcher); |
262 } | 262 } |
263 | 263 |
264 } // namespace test | 264 } // namespace test |
265 } // namespace aura | 265 } // namespace aura |
OLD | NEW |