| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/host/ash_window_tree_host_x11.h" | 5 #include "ash/host/ash_window_tree_host_x11.h" |
| 6 | 6 |
| 7 #include <X11/extensions/Xfixes.h> | 7 #include <X11/extensions/Xfixes.h> |
| 8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
| 9 #include <X11/Xatom.h> | 9 #include <X11/Xatom.h> |
| 10 #include <X11/Xlib.h> | 10 #include <X11/Xlib.h> |
| 11 | 11 |
| 12 #include <string> | 12 #include <string> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "ash/host/ash_window_tree_host_init_params.h" | 15 #include "ash/host/ash_window_tree_host_init_params.h" |
| 16 #include "ash/host/ash_window_tree_host_virtual.h" |
| 16 #include "ash/host/root_window_transformer.h" | 17 #include "ash/host/root_window_transformer.h" |
| 17 #include "base/basictypes.h" | 18 #include "base/basictypes.h" |
| 18 #include "base/sys_info.h" | 19 #include "base/sys_info.h" |
| 19 #include "ui/aura/env.h" | 20 #include "ui/aura/env.h" |
| 20 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 21 #include "ui/aura/window_event_dispatcher.h" | 22 #include "ui/aura/window_event_dispatcher.h" |
| 22 #include "ui/base/x/x11_util.h" | 23 #include "ui/base/x/x11_util.h" |
| 23 #include "ui/events/devices/device_data_manager.h" | 24 #include "ui/events/devices/device_data_manager.h" |
| 24 #include "ui/events/devices/x11/device_list_cache_x11.h" | 25 #include "ui/events/devices/x11/device_list_cache_x11.h" |
| 25 #include "ui/events/devices/x11/touch_factory_x11.h" | 26 #include "ui/events/devices/x11/touch_factory_x11.h" |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 PropModeReplace, | 274 PropModeReplace, |
| 274 &value, | 275 &value, |
| 275 1); | 276 1); |
| 276 } | 277 } |
| 277 } | 278 } |
| 278 } | 279 } |
| 279 #endif | 280 #endif |
| 280 | 281 |
| 281 AshWindowTreeHost* AshWindowTreeHost::Create( | 282 AshWindowTreeHost* AshWindowTreeHost::Create( |
| 282 const AshWindowTreeHostInitParams& init_params) { | 283 const AshWindowTreeHostInitParams& init_params) { |
| 284 if (init_params.offscreen) |
| 285 return new AshWindowTreeHostVirtual(init_params.initial_bounds); |
| 283 return new AshWindowTreeHostX11(init_params.initial_bounds); | 286 return new AshWindowTreeHostX11(init_params.initial_bounds); |
| 284 } | 287 } |
| 285 | 288 |
| 286 } // namespace ash | 289 } // namespace ash |
| OLD | NEW |