| 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 12 matching lines...) Expand all Loading... |
| 23 #include "ui/events/event.h" | 23 #include "ui/events/event.h" |
| 24 #include "ui/events/event_utils.h" | 24 #include "ui/events/event_utils.h" |
| 25 #include "ui/events/x/device_data_manager.h" | 25 #include "ui/events/x/device_data_manager.h" |
| 26 #include "ui/events/x/device_list_cache_x.h" | 26 #include "ui/events/x/device_list_cache_x.h" |
| 27 #include "ui/events/x/touch_factory_x11.h" | 27 #include "ui/events/x/touch_factory_x11.h" |
| 28 #include "ui/gfx/rect.h" | 28 #include "ui/gfx/rect.h" |
| 29 #include "ui/gfx/screen.h" | 29 #include "ui/gfx/screen.h" |
| 30 | 30 |
| 31 namespace ash { | 31 namespace ash { |
| 32 | 32 |
| 33 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds) | 33 AshWindowTreeHostX11::AshWindowTreeHostX11(const gfx::Rect& initial_bounds, |
| 34 : WindowTreeHostX11(initial_bounds), | 34 ui::ContextFactory* context_factory) |
| 35 : WindowTreeHostX11(initial_bounds, context_factory), |
| 35 transformer_helper_(this), | 36 transformer_helper_(this), |
| 36 display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID, | 37 display_ids_(std::make_pair(gfx::Display::kInvalidDisplayID, |
| 37 gfx::Display::kInvalidDisplayID)) { | 38 gfx::Display::kInvalidDisplayID)) { |
| 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 } |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 8, | 278 8, |
| 278 PropModeReplace, | 279 PropModeReplace, |
| 279 &value, | 280 &value, |
| 280 1); | 281 1); |
| 281 } | 282 } |
| 282 } | 283 } |
| 283 } | 284 } |
| 284 | 285 |
| 285 AshWindowTreeHost* AshWindowTreeHost::Create( | 286 AshWindowTreeHost* AshWindowTreeHost::Create( |
| 286 const AshWindowTreeHostInitParams& init_params) { | 287 const AshWindowTreeHostInitParams& init_params) { |
| 287 return new AshWindowTreeHostX11(init_params.initial_bounds); | 288 return new AshWindowTreeHostX11(init_params.initial_bounds, |
| 289 init_params.context_factory); |
| 288 } | 290 } |
| 289 | 291 |
| 290 } // namespace ash | 292 } // namespace ash |
| OLD | NEW |