| 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 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 5 #ifndef ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 6 #define ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/host/ash_window_tree_host.h" | 9 #include "ash/host/ash_window_tree_host.h" |
| 10 #include "ash/host/transformer_helper.h" | 10 #include "ash/host/transformer_helper.h" |
| 11 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 #include "ui/aura/env_observer.h" | 13 #include "ui/aura/env_observer.h" |
| 13 #include "ui/aura/window_tree_host_x11.h" | 14 #include "ui/aura/window_tree_host_x11.h" |
| 14 | 15 |
| 15 namespace ash { | 16 namespace ash { |
| 16 class RootWindowTransformer; | 17 class RootWindowTransformer; |
| 17 class MouseCursorEventFilter; | 18 class MouseCursorEventFilter; |
| 18 | 19 |
| 19 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, | 20 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, |
| 20 public aura::WindowTreeHostX11, | 21 public aura::WindowTreeHostX11, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 scoped_ptr<XID[]> pointer_barriers_; | 65 scoped_ptr<XID[]> pointer_barriers_; |
| 65 | 66 |
| 66 TransformerHelper transformer_helper_; | 67 TransformerHelper transformer_helper_; |
| 67 | 68 |
| 68 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 69 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); |
| 69 }; | 70 }; |
| 70 | 71 |
| 71 } // namespace ash | 72 } // namespace ash |
| 72 | 73 |
| 73 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 74 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| OLD | NEW |