| 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/logging.h" | 13 #include "base/logging.h" |
| 14 #include "ui/aura/client/screen_position_client.h" | 14 #include "ui/aura/client/screen_position_client.h" |
| 15 #include "ui/aura/env.h" | 15 #include "ui/aura/env.h" |
| 16 #include "ui/aura/root_window.h" | |
| 17 #include "ui/aura/test/ui_controls_factory_aura.h" | 16 #include "ui/aura/test/ui_controls_factory_aura.h" |
| 17 #include "ui/aura/window_event_dispatcher.h" |
| 18 #include "ui/base/test/ui_controls_aura.h" | 18 #include "ui/base/test/ui_controls_aura.h" |
| 19 #include "ui/base/x/x11_util.h" | 19 #include "ui/base/x/x11_util.h" |
| 20 #include "ui/compositor/dip_util.h" | 20 #include "ui/compositor/dip_util.h" |
| 21 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 21 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
| 22 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" | 22 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" |
| 23 | 23 |
| 24 namespace views { | 24 namespace views { |
| 25 namespace test { | 25 namespace test { |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 }; | 314 }; |
| 315 | 315 |
| 316 } // namespace | 316 } // namespace |
| 317 | 317 |
| 318 UIControlsAura* CreateUIControlsDesktopAura() { | 318 UIControlsAura* CreateUIControlsDesktopAura() { |
| 319 return new UIControlsDesktopX11(); | 319 return new UIControlsDesktopX11(); |
| 320 } | 320 } |
| 321 | 321 |
| 322 } // namespace test | 322 } // namespace test |
| 323 } // namespace views | 323 } // namespace views |
| OLD | NEW |