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/root_window_transformer.h" | 16 #include "ash/host/root_window_transformer.h" |
17 #include "base/basictypes.h" | 17 #include "base/basictypes.h" |
18 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
19 #include "ui/aura/env.h" | 19 #include "ui/aura/env.h" |
20 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
21 #include "ui/aura/window_event_dispatcher.h" | 21 #include "ui/aura/window_event_dispatcher.h" |
22 #include "ui/base/x/x11_util.h" | 22 #include "ui/base/x/x11_util.h" |
23 #include "ui/events/devices/device_data_manager.h" | 23 #include "ui/events/devices/device_data_manager.h" |
24 #include "ui/events/devices/x11/device_list_cache_x11.h" | 24 #include "ui/events/devices/x11/device_list_cache_x11.h" |
25 #include "ui/events/devices/x11/touch_factory_x11.h" | 25 #include "ui/events/devices/x11/touch_factory_x11.h" |
26 #include "ui/events/event.h" | 26 #include "ui/events/event.h" |
27 #include "ui/events/event_utils.h" | 27 #include "ui/events/event_utils.h" |
28 #include "ui/events/platform/platform_event_source.h" | 28 #include "ui/events/platform/platform_event_source.h" |
29 #include "ui/gfx/rect.h" | 29 #include "ui/gfx/geometry/rect.h" |
30 #include "ui/gfx/screen.h" | 30 #include "ui/gfx/screen.h" |
31 | 31 |
32 namespace ash { | 32 namespace ash { |
33 | 33 |
34 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) | 34 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) |
35 : WindowTreeHostX11(initial_bounds), | 35 : WindowTreeHostX11(initial_bounds), |
36 transformer_helper_(this), | 36 transformer_helper_(this), |
37 display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID, | 37 display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID, |
38 gfx::Display::kInvalidDisplayID)) { | 38 gfx::Display::kInvalidDisplayID)) { |
39 aura::Env::GetInstance()->AddObserver(this); | 39 aura::Env::GetInstance()->AddObserver(this); |
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 } | 273 } |
274 } | 274 } |
275 #endif | 275 #endif |
276 | 276 |
277 AshWindowTreeHost* AshWindowTreeHost::Create( | 277 AshWindowTreeHost* AshWindowTreeHost::Create( |
278 const AshWindowTreeHostInitParams& init_params) { | 278 const AshWindowTreeHostInitParams& init_params) { |
279 return new AshWindowTreeHostX11(init_params.initial_bounds); | 279 return new AshWindowTreeHostX11(init_params.initial_bounds); |
280 } | 280 } |
281 | 281 |
282 } // namespace ash | 282 } // namespace ash |
OLD | NEW |