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> |
(...skipping 29 matching lines...) Expand all Loading... |
40 aura::Window* OnWmCreateTopLevelWindow( | 40 aura::Window* OnWmCreateTopLevelWindow( |
41 ui::mojom::WindowType window_type, | 41 ui::mojom::WindowType window_type, |
42 std::map<std::string, std::vector<uint8_t>>* properties) final; | 42 std::map<std::string, std::vector<uint8_t>>* properties) final; |
43 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, | 43 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, |
44 bool janky) final; | 44 bool janky) final; |
45 void OnWmWillCreateDisplay(const display::Display& display) final; | 45 void OnWmWillCreateDisplay(const display::Display& display) final; |
46 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 46 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
47 const display::Display& display) final; | 47 const display::Display& display) final; |
48 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) final; | 48 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) final; |
49 void OnWmDisplayModified(const display::Display& display) final; | 49 void OnWmDisplayModified(const display::Display& display) final; |
50 ui::mojom::EventResult OnAccelerator(uint32_t id, | 50 ui::mojom::EventResult OnAccelerator( |
51 const ui::Event& event) final; | 51 uint32_t id, |
| 52 const ui::Event& event, |
| 53 std::unordered_map<std::string, std::vector<uint8_t>>* properties) final; |
52 void OnWmPerformMoveLoop(aura::Window* window, | 54 void OnWmPerformMoveLoop(aura::Window* window, |
53 ui::mojom::MoveLoopSource source, | 55 ui::mojom::MoveLoopSource source, |
54 const gfx::Point& cursor_location, | 56 const gfx::Point& cursor_location, |
55 const base::Callback<void(bool)>& on_done) final; | 57 const base::Callback<void(bool)>& on_done) final; |
56 void OnWmCancelMoveLoop(aura::Window* window) final; | 58 void OnWmCancelMoveLoop(aura::Window* window) final; |
57 void OnWmSetClientArea( | 59 void OnWmSetClientArea( |
58 aura::Window* window, | 60 aura::Window* window, |
59 const gfx::Insets& insets, | 61 const gfx::Insets& insets, |
60 const std::vector<gfx::Rect>& additional_client_areas) final; | 62 const std::vector<gfx::Rect>& additional_client_areas) final; |
61 bool IsWindowActive(aura::Window* window) final; | 63 bool IsWindowActive(aura::Window* window) final; |
62 void OnWmDeactivateWindow(aura::Window* window) final; | 64 void OnWmDeactivateWindow(aura::Window* window) final; |
63 | 65 |
64 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal); | 66 DISALLOW_COPY_AND_ASSIGN(MusDemoInternal); |
65 }; | 67 }; |
66 | 68 |
67 } // namespace demo | 69 } // namespace demo |
68 } // namespace ui | 70 } // namespace ui |
69 | 71 |
70 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ | 72 #endif // SERVICES_UI_DEMO_MUS_DEMO_INTERNAL_H_ |
OLD | NEW |