| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ |
| 6 #define MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "components/mus/public/cpp/view_observer.h" | 9 #include "components/mus/public/cpp/view_observer.h" |
| 10 #include "ui/aura/window_tree_host.h" | 10 #include "ui/aura/window_tree_host.h" |
| 11 #include "ui/events/event_source.h" | 11 #include "ui/events/event_source.h" |
| 12 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 13 | 13 |
| 14 class SkBitmap; | 14 class SkBitmap; |
| 15 | 15 |
| 16 namespace mojo { |
| 17 class Shell; |
| 18 } |
| 19 |
| 16 namespace ui { | 20 namespace ui { |
| 17 class Compositor; | 21 class Compositor; |
| 18 } | 22 } |
| 19 | 23 |
| 20 namespace mojo { | 24 namespace views { |
| 21 class Shell; | |
| 22 } | |
| 23 | 25 |
| 24 namespace mandoline { | 26 class InputMethodMUS; |
| 25 | |
| 26 class InputMethodMandoline; | |
| 27 class SurfaceContextFactory; | 27 class SurfaceContextFactory; |
| 28 | 28 |
| 29 class WindowTreeHostMojo : public aura::WindowTreeHost, | 29 class WindowTreeHostMojo : public aura::WindowTreeHost, |
| 30 public mus::ViewObserver { | 30 public mus::ViewObserver { |
| 31 public: | 31 public: |
| 32 WindowTreeHostMojo(mojo::Shell* shell, mus::View* view); | 32 WindowTreeHostMojo(mojo::Shell* shell, mus::View* view); |
| 33 ~WindowTreeHostMojo() override; | 33 ~WindowTreeHostMojo() override; |
| 34 | 34 |
| 35 const gfx::Rect& bounds() const { return bounds_; } | 35 const gfx::Rect& bounds() const { return bounds_; } |
| 36 | 36 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 55 | 55 |
| 56 // mus::ViewObserver: | 56 // mus::ViewObserver: |
| 57 void OnViewBoundsChanged(mus::View* view, | 57 void OnViewBoundsChanged(mus::View* view, |
| 58 const mojo::Rect& old_bounds, | 58 const mojo::Rect& old_bounds, |
| 59 const mojo::Rect& new_bounds) override; | 59 const mojo::Rect& new_bounds) override; |
| 60 | 60 |
| 61 mus::View* view_; | 61 mus::View* view_; |
| 62 | 62 |
| 63 gfx::Rect bounds_; | 63 gfx::Rect bounds_; |
| 64 | 64 |
| 65 scoped_ptr<InputMethodMandoline> input_method_; | 65 scoped_ptr<InputMethodMUS> input_method_; |
| 66 | 66 |
| 67 scoped_ptr<SurfaceContextFactory> context_factory_; | 67 scoped_ptr<SurfaceContextFactory> context_factory_; |
| 68 | 68 |
| 69 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo); | 69 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMojo); |
| 70 }; | 70 }; |
| 71 | 71 |
| 72 } // namespace mandoline | 72 } // namespace views |
| 73 | 73 |
| 74 #endif // MANDOLINE_UI_AURA_WINDOW_TREE_HOST_MOJO_H_ | 74 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |