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/root_window_transformer.h" | 16 #include "ash/host/root_window_transformer.h" |
16 #include "base/basictypes.h" | 17 #include "base/basictypes.h" |
17 #include "base/sys_info.h" | 18 #include "base/sys_info.h" |
18 #include "ui/aura/client/screen_position_client.h" | 19 #include "ui/aura/client/screen_position_client.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/base/x/x11_util.h" | 22 #include "ui/base/x/x11_util.h" |
22 #include "ui/events/event.h" | 23 #include "ui/events/event.h" |
23 #include "ui/events/event_utils.h" | 24 #include "ui/events/event_utils.h" |
24 #include "ui/events/x/device_data_manager.h" | 25 #include "ui/events/x/device_data_manager.h" |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 prop, | 275 prop, |
275 XA_INTEGER, | 276 XA_INTEGER, |
276 8, | 277 8, |
277 PropModeReplace, | 278 PropModeReplace, |
278 &value, | 279 &value, |
279 1); | 280 1); |
280 } | 281 } |
281 } | 282 } |
282 } | 283 } |
283 | 284 |
284 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { | 285 AshWindowTreeHost* AshWindowTreeHost::Create( |
285 return new AshWindowTreeHostX11(initial_bounds); | 286 const AshWindowTreeHostInitParams& init_params) { |
| 287 return new AshWindowTreeHostX11(init_params.initial_bounds); |
286 } | 288 } |
287 | 289 |
288 } // namespace ash | 290 } // namespace ash |
OLD | NEW |