OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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_INTERNAL_H_ | 5 #ifndef SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ |
6 #define SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ | 6 #define SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <memory> | 9 #include <memory> |
10 #include <set> | 10 #include <set> |
11 #include <string> | 11 #include <string> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "services/ui/demo/mus_demo.h" | 14 #include "services/ui/demo/mus_demo.h" |
15 #include "ui/aura/mus/window_manager_delegate.h" | 15 #include "ui/aura/mus/window_manager_delegate.h" |
16 | 16 |
17 namespace ui { | 17 namespace ui { |
18 namespace demo { | 18 namespace demo { |
19 | 19 |
20 class MusDemoInternal : public MusDemo, public aura::WindowManagerDelegate { | 20 class MusDemoInternal : public MusDemo, public aura::WindowManagerDelegate { |
21 public: | 21 public: |
22 MusDemoInternal(); | 22 MusDemoInternal(); |
23 ~MusDemoInternal() final; | 23 ~MusDemoInternal() final; |
24 | 24 |
25 private: | 25 private: |
26 void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>& window_tree_client, | 26 // ui::demo::MusDemo: |
27 std::unique_ptr<WindowTreeData>& window_tree_data) final; | 27 void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>* window_tree_client, |
| 28 std::unique_ptr<WindowTreeData>* window_tree_data) final; |
28 | 29 |
29 // aura::WindowManagerDelegate: | 30 // aura::WindowManagerDelegate: |
30 void SetWindowManagerClient(aura::WindowManagerClient* client) final; | 31 void SetWindowManagerClient(aura::WindowManagerClient* client) final; |
31 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) final; | 32 bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) final; |
32 bool OnWmSetProperty(aura::Window* window, | 33 bool OnWmSetProperty(aura::Window* window, |
33 const std::string& name, | 34 const std::string& name, |
34 std::unique_ptr<std::vector<uint8_t>>* new_data) final; | 35 std::unique_ptr<std::vector<uint8_t>>* new_data) final; |
35 void OnWmSetCanFocus(aura::Window* window, bool can_focus) final; | 36 void OnWmSetCanFocus(aura::Window* window, bool can_focus) final; |
36 aura::Window* OnWmCreateTopLevelWindow( | 37 aura::Window* OnWmCreateTopLevelWindow( |
37 ui::mojom::WindowType window_type, | 38 ui::mojom::WindowType window_type, |
(...skipping 19 matching lines...) Expand all Loading... |
57 bool IsWindowActive(aura::Window* window) final; | 58 bool IsWindowActive(aura::Window* window) final; |
58 void OnWmDeactivateWindow(aura::Window* window) final; | 59 void OnWmDeactivateWindow(aura::Window* window) final; |
59 | 60 |
60 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal); | 61 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal); |
61 }; | 62 }; |
62 | 63 |
63 } // namespace demo | 64 } // namespace demo |
64 } // namespace ui | 65 } // namespace ui |
65 | 66 |
66 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ | 67 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ |
OLD | NEW |