| 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 UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ |
| 6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_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/interfaces/window_tree.mojom.h" | 9 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 10 #include "ui/aura/window_tree_host_platform.h" | 10 #include "ui/aura/window_tree_host_platform.h" |
| 11 #include "ui/views/widget/native_widget_private.h" | 11 #include "ui/views/widget/native_widget_private.h" |
| 12 | 12 |
| 13 class SkBitmap; | 13 class SkBitmap; |
| 14 | 14 |
| 15 namespace bitmap_uploader { |
| 16 class BitmapUploader; |
| 17 } |
| 18 |
| 15 namespace mojo { | 19 namespace mojo { |
| 16 class Shell; | 20 class Shell; |
| 17 } | 21 } |
| 18 | 22 |
| 19 namespace mus { | 23 namespace mus { |
| 20 class Window; | 24 class Window; |
| 21 } | 25 } |
| 22 | 26 |
| 23 namespace ui { | 27 namespace ui { |
| 24 class Compositor; | 28 class Compositor; |
| 29 class ViewProp; |
| 25 } | 30 } |
| 26 | 31 |
| 27 namespace views { | 32 namespace views { |
| 28 | 33 |
| 29 class InputMethodMUS; | 34 class InputMethodMUS; |
| 30 class NativeWidgetMus; | 35 class NativeWidgetMus; |
| 31 class SurfaceContextFactory; | 36 class SurfaceContextFactory; |
| 32 | 37 |
| 33 class WindowTreeHostMus : public aura::WindowTreeHostPlatform { | 38 class WindowTreeHostMus : public aura::WindowTreeHostPlatform { |
| 34 public: | 39 public: |
| (...skipping 10 matching lines...) Expand all Loading... |
| 45 // aura::WindowTreeHostPlatform: | 50 // aura::WindowTreeHostPlatform: |
| 46 void DispatchEvent(ui::Event* event) override; | 51 void DispatchEvent(ui::Event* event) override; |
| 47 void OnClosed() override; | 52 void OnClosed() override; |
| 48 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; | 53 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; |
| 49 void OnActivationChanged(bool active) override; | 54 void OnActivationChanged(bool active) override; |
| 50 | 55 |
| 51 NativeWidgetMus* native_widget_; | 56 NativeWidgetMus* native_widget_; |
| 52 scoped_ptr<InputMethodMUS> input_method_; | 57 scoped_ptr<InputMethodMUS> input_method_; |
| 53 scoped_ptr<SurfaceContextFactory> context_factory_; | 58 scoped_ptr<SurfaceContextFactory> context_factory_; |
| 54 ui::PlatformWindowState show_state_; | 59 ui::PlatformWindowState show_state_; |
| 60 scoped_ptr<bitmap_uploader::BitmapUploader> bitmap_uploader_; |
| 61 scoped_ptr<ui::ViewProp> prop_; |
| 55 | 62 |
| 56 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); | 63 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); |
| 57 }; | 64 }; |
| 58 | 65 |
| 59 } // namespace views | 66 } // namespace views |
| 60 | 67 |
| 61 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ | 68 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |