| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 void AshWindowTreeHostX11::SetRootWindowTransformer( | 247 void AshWindowTreeHostX11::SetRootWindowTransformer( |
| 248 scoped_ptr<RootWindowTransformer> transformer) { | 248 scoped_ptr<RootWindowTransformer> transformer) { |
| 249 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); | 249 transformer_helper_.SetRootWindowTransformer(transformer.Pass()); |
| 250 UpdateIsInternalDisplay(); | 250 UpdateIsInternalDisplay(); |
| 251 if (pointer_barriers_) { | 251 if (pointer_barriers_) { |
| 252 UnConfineCursor(); | 252 UnConfineCursor(); |
| 253 ConfineCursorToRootWindow(); | 253 ConfineCursorToRootWindow(); |
| 254 } | 254 } |
| 255 } | 255 } |
| 256 | 256 |
| 257 gfx::Insets AshWindowTreeHostX11::GetHostInsets() const { |
| 258 return transformer_helper_.GetHostInsets(); |
| 259 } |
| 260 |
| 257 aura::WindowTreeHost* AshWindowTreeHostX11::AsWindowTreeHost() { return this; } | 261 aura::WindowTreeHost* AshWindowTreeHostX11::AsWindowTreeHost() { return this; } |
| 258 | 262 |
| 259 void AshWindowTreeHostX11::SetBounds(const gfx::Rect& bounds) { | 263 void AshWindowTreeHostX11::SetBounds(const gfx::Rect& bounds) { |
| 260 WindowTreeHostX11::SetBounds(bounds); | 264 WindowTreeHostX11::SetBounds(bounds); |
| 261 UpdateIsInternalDisplay(); | 265 UpdateIsInternalDisplay(); |
| 262 if (pointer_barriers_) { | 266 if (pointer_barriers_) { |
| 263 UnConfineCursor(); | 267 UnConfineCursor(); |
| 264 ConfineCursorToRootWindow(); | 268 ConfineCursorToRootWindow(); |
| 265 } | 269 } |
| 266 } | 270 } |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 1); | 413 1); |
| 410 } | 414 } |
| 411 } | 415 } |
| 412 } | 416 } |
| 413 | 417 |
| 414 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { | 418 AshWindowTreeHost* AshWindowTreeHost::Create(const gfx::Rect& initial_bounds) { |
| 415 return new AshWindowTreeHostX11(initial_bounds); | 419 return new AshWindowTreeHostX11(initial_bounds); |
| 416 } | 420 } |
| 417 | 421 |
| 418 } // namespace ash | 422 } // namespace ash |
| OLD | NEW |