| 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/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "ui/aura/env_observer.h" | 12 #include "ui/aura/env_observer.h" |
| 13 #include "ui/aura/window_tree_host_x11.h" | 13 #include "ui/aura/window_tree_host_x11.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 class RootWindowTransformer; | 16 class RootWindowTransformer; |
| 17 class MouseCursorEventFilter; | 17 class MouseCursorEventFilter; |
| 18 | 18 |
| 19 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, | 19 class ASH_EXPORT AshWindowTreeHostX11 : public AshWindowTreeHost, |
| 20 public aura::WindowTreeHostX11, | 20 public aura::WindowTreeHostX11, |
| 21 public aura::EnvObserver { | 21 public aura::EnvObserver { |
| 22 public: | 22 public: |
| 23 explicit AshWindowTreeHostX11(const gfx::Rect& initial_bounds); | 23 AshWindowTreeHostX11(const gfx::Rect& initial_bounds, |
| 24 ui::ContextFactory* context_factory); |
| 24 virtual ~AshWindowTreeHostX11(); | 25 virtual ~AshWindowTreeHostX11(); |
| 25 | 26 |
| 26 private: | 27 private: |
| 27 // AshWindowTreeHost: | 28 // AshWindowTreeHost: |
| 28 virtual void ToggleFullScreen() OVERRIDE; | 29 virtual void ToggleFullScreen() OVERRIDE; |
| 29 virtual bool ConfineCursorToRootWindow() OVERRIDE; | 30 virtual bool ConfineCursorToRootWindow() OVERRIDE; |
| 30 virtual void UnConfineCursor() OVERRIDE; | 31 virtual void UnConfineCursor() OVERRIDE; |
| 31 virtual void SetRootWindowTransformer( | 32 virtual void SetRootWindowTransformer( |
| 32 scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; | 33 scoped_ptr<RootWindowTransformer> transformer) OVERRIDE; |
| 33 virtual gfx::Insets GetHostInsets() const OVERRIDE; | 34 virtual gfx::Insets GetHostInsets() const OVERRIDE; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 // In mirror mode dual monitors case, the root window is associated with | 67 // In mirror mode dual monitors case, the root window is associated with |
| 67 // both displays. | 68 // both displays. |
| 68 std::pair<int64, int64> display_ids_; | 69 std::pair<int64, int64> display_ids_; |
| 69 | 70 |
| 70 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); | 71 DISALLOW_COPY_AND_ASSIGN(AshWindowTreeHostX11); |
| 71 }; | 72 }; |
| 72 | 73 |
| 73 } // namespace ash | 74 } // namespace ash |
| 74 | 75 |
| 75 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ | 76 #endif // ASH_HOST_ASH_WINDOW_TREE_HOST_X11_H_ |
| OLD | NEW |