| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 SERVICES_UI_DEMO_MUS_DEMO_H_ | 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_ |
| 6 #define SERVICES_UI_DEMO_MUS_DEMO_H_ | 6 #define SERVICES_UI_DEMO_MUS_DEMO_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 namespace aura_extra { | 32 namespace aura_extra { |
| 33 class ImageWindowDelegate; | 33 class ImageWindowDelegate; |
| 34 } | 34 } |
| 35 | 35 |
| 36 namespace wm { | 36 namespace wm { |
| 37 class WMState; | 37 class WMState; |
| 38 } | 38 } |
| 39 | 39 |
| 40 namespace ui { | 40 namespace ui { |
| 41 class ContextFactory; | 41 class ContextFactory; |
| 42 class GpuService; | 42 class Gpu; |
| 43 | 43 |
| 44 namespace demo { | 44 namespace demo { |
| 45 | 45 |
| 46 // A simple MUS Demo service. This service connects to the service:ui, adds a | 46 // A simple MUS Demo service. This service connects to the service:ui, adds a |
| 47 // new window to the root Window, and draws a spinning square in the center of | 47 // new window to the root Window, and draws a spinning square in the center of |
| 48 // the window. Provides a simple way to demonstrate that the graphic stack works | 48 // the window. Provides a simple way to demonstrate that the graphic stack works |
| 49 // as intended. | 49 // as intended. |
| 50 class MusDemo : public service_manager::Service, | 50 class MusDemo : public service_manager::Service, |
| 51 public aura::WindowTreeClientDelegate, | 51 public aura::WindowTreeClientDelegate, |
| 52 public aura::WindowManagerDelegate { | 52 public aura::WindowManagerDelegate { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 aura::Window* window, | 99 aura::Window* window, |
| 100 const gfx::Insets& insets, | 100 const gfx::Insets& insets, |
| 101 const std::vector<gfx::Rect>& additional_client_areas) override; | 101 const std::vector<gfx::Rect>& additional_client_areas) override; |
| 102 | 102 |
| 103 // Draws one frame, incrementing the rotation angle. | 103 // Draws one frame, incrementing the rotation angle. |
| 104 void DrawFrame(); | 104 void DrawFrame(); |
| 105 | 105 |
| 106 aura::Window* root_window_ = nullptr; | 106 aura::Window* root_window_ = nullptr; |
| 107 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; | 107 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
| 108 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; | 108 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_; |
| 109 std::unique_ptr<ui::GpuService> gpu_service_; | 109 std::unique_ptr<ui::Gpu> gpu_; |
| 110 std::unique_ptr<ui::ContextFactory> context_factory_; | 110 std::unique_ptr<ui::ContextFactory> context_factory_; |
| 111 std::unique_ptr<aura::Env> env_; | 111 std::unique_ptr<aura::Env> env_; |
| 112 std::unique_ptr<display::ScreenBase> screen_; | 112 std::unique_ptr<display::ScreenBase> screen_; |
| 113 | 113 |
| 114 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; | 114 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 115 std::unique_ptr<::wm::WMState> wm_state_; | 115 std::unique_ptr<::wm::WMState> wm_state_; |
| 116 std::unique_ptr<aura::PropertyConverter> property_converter_; | 116 std::unique_ptr<aura::PropertyConverter> property_converter_; |
| 117 | 117 |
| 118 // Window to which we draw the bitmap. | 118 // Window to which we draw the bitmap. |
| 119 std::unique_ptr<aura::Window> bitmap_window_; | 119 std::unique_ptr<aura::Window> bitmap_window_; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 133 // Last time a frame was drawn. | 133 // Last time a frame was drawn. |
| 134 base::TimeTicks last_draw_frame_time_; | 134 base::TimeTicks last_draw_frame_time_; |
| 135 | 135 |
| 136 DISALLOW_COPY_AND_ASSIGN(MusDemo); | 136 DISALLOW_COPY_AND_ASSIGN(MusDemo); |
| 137 }; | 137 }; |
| 138 | 138 |
| 139 } // namespace demo | 139 } // namespace demo |
| 140 } // namespace aura | 140 } // namespace aura |
| 141 | 141 |
| 142 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_ | 142 #endif // SERVICES_UI_DEMO_MUS_DEMO_H_ |
| OLD | NEW |