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> |
(...skipping 17 matching lines...) Expand all Loading... |
28 #include "ui/events/event_utils.h" | 28 #include "ui/events/event_utils.h" |
29 #include "ui/events/null_event_targeter.h" | 29 #include "ui/events/null_event_targeter.h" |
30 #include "ui/events/platform/platform_event_source.h" | 30 #include "ui/events/platform/platform_event_source.h" |
31 #include "ui/gfx/geometry/rect.h" | 31 #include "ui/gfx/geometry/rect.h" |
32 #include "ui/gfx/screen.h" | 32 #include "ui/gfx/screen.h" |
33 | 33 |
34 namespace ash { | 34 namespace ash { |
35 | 35 |
36 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) | 36 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) |
37 : WindowTreeHostX11(initial_bounds), transformer_helper_(this) { | 37 : WindowTreeHostX11(initial_bounds), transformer_helper_(this) { |
| 38 transformer_helper_.Init(); |
38 aura::Env::GetInstance()->AddObserver(this); | 39 aura::Env::GetInstance()->AddObserver(this); |
39 } | 40 } |
40 | 41 |
41 AshWindowTreeHostX11::~AshWindowTreeHostX11() { | 42 AshWindowTreeHostX11::~AshWindowTreeHostX11() { |
42 aura::Env::GetInstance()->RemoveObserver(this); | 43 aura::Env::GetInstance()->RemoveObserver(this); |
43 UnConfineCursor(); | 44 UnConfineCursor(); |
44 } | 45 } |
45 | 46 |
46 void AshWindowTreeHostX11::ToggleFullScreen() { NOTIMPLEMENTED(); } | 47 void AshWindowTreeHostX11::ToggleFullScreen() { NOTIMPLEMENTED(); } |
47 | 48 |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 #endif | 281 #endif |
281 | 282 |
282 AshWindowTreeHost* AshWindowTreeHost::Create( | 283 AshWindowTreeHost* AshWindowTreeHost::Create( |
283 const AshWindowTreeHostInitParams& init_params) { | 284 const AshWindowTreeHostInitParams& init_params) { |
284 if (init_params.offscreen) | 285 if (init_params.offscreen) |
285 return new AshWindowTreeHostUnified(init_params.initial_bounds); | 286 return new AshWindowTreeHostUnified(init_params.initial_bounds); |
286 return new AshWindowTreeHostX11(init_params.initial_bounds); | 287 return new AshWindowTreeHostX11(init_params.initial_bounds); |
287 } | 288 } |
288 | 289 |
289 } // namespace ash | 290 } // namespace ash |
OLD | NEW |