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 // X macro fail. | 8 // X macro fail. |
9 #if defined(RootWindow) | 9 #if defined(RootWindow) |
10 #undef RootWindow | 10 #undef RootWindow |
11 #endif | 11 #endif |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
| 15 #include "base/macros.h" |
15 #include "ui/aura/client/screen_position_client.h" | 16 #include "ui/aura/client/screen_position_client.h" |
16 #include "ui/aura/env.h" | 17 #include "ui/aura/env.h" |
17 #include "ui/aura/test/aura_test_utils.h" | 18 #include "ui/aura/test/aura_test_utils.h" |
18 #include "ui/aura/test/ui_controls_factory_aura.h" | 19 #include "ui/aura/test/ui_controls_factory_aura.h" |
19 #include "ui/aura/test/x11_event_sender.h" | 20 #include "ui/aura/test/x11_event_sender.h" |
20 #include "ui/aura/window_event_dispatcher.h" | 21 #include "ui/aura/window_event_dispatcher.h" |
21 #include "ui/base/test/ui_controls_aura.h" | 22 #include "ui/base/test/ui_controls_aura.h" |
22 #include "ui/base/x/x11_util.h" | 23 #include "ui/base/x/x11_util.h" |
23 #include "ui/compositor/dip_util.h" | 24 #include "ui/compositor/dip_util.h" |
24 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 25 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 | 280 |
280 UIControlsAura* CreateUIControlsDesktopAura() { | 281 UIControlsAura* CreateUIControlsDesktopAura() { |
281 // The constructor of UIControlsDesktopX11 needs X11 connection to be | 282 // The constructor of UIControlsDesktopX11 needs X11 connection to be |
282 // initialized. | 283 // initialized. |
283 gfx::InitializeThreadedX11(); | 284 gfx::InitializeThreadedX11(); |
284 return new UIControlsDesktopX11(); | 285 return new UIControlsDesktopX11(); |
285 } | 286 } |
286 | 287 |
287 } // namespace test | 288 } // namespace test |
288 } // namespace views | 289 } // namespace views |
OLD | NEW |