OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_AURA_TEST_AURA_TEST_BASE_H_ | 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ |
6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ | 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 Window* OnWmCreateTopLevelWindow( | 106 Window* OnWmCreateTopLevelWindow( |
107 ui::mojom::WindowType window_type, | 107 ui::mojom::WindowType window_type, |
108 std::map<std::string, std::vector<uint8_t>>* properties) override; | 108 std::map<std::string, std::vector<uint8_t>>* properties) override; |
109 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 109 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
110 bool janky) override; | 110 bool janky) override; |
111 void OnWmWillCreateDisplay(const display::Display& display) override; | 111 void OnWmWillCreateDisplay(const display::Display& display) override; |
112 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host, | 112 void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host, |
113 const display::Display& display) override; | 113 const display::Display& display) override; |
114 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override; | 114 void OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) override; |
115 void OnWmDisplayModified(const display::Display& display) override; | 115 void OnWmDisplayModified(const display::Display& display) override; |
116 ui::mojom::EventResult OnAccelerator(uint32_t id, | 116 ui::mojom::EventResult OnAccelerator( |
117 const ui::Event& event) override; | 117 uint32_t id, |
| 118 const ui::Event& event, |
| 119 std::unordered_map<std::string, std::vector<uint8_t>>* properties) |
| 120 override; |
118 void OnWmPerformMoveLoop(Window* window, | 121 void OnWmPerformMoveLoop(Window* window, |
119 ui::mojom::MoveLoopSource source, | 122 ui::mojom::MoveLoopSource source, |
120 const gfx::Point& cursor_location, | 123 const gfx::Point& cursor_location, |
121 const base::Callback<void(bool)>& on_done) override; | 124 const base::Callback<void(bool)>& on_done) override; |
122 void OnWmCancelMoveLoop(Window* window) override; | 125 void OnWmCancelMoveLoop(Window* window) override; |
123 void OnWmSetClientArea( | 126 void OnWmSetClientArea( |
124 Window* window, | 127 Window* window, |
125 const gfx::Insets& insets, | 128 const gfx::Insets& insets, |
126 const std::vector<gfx::Rect>& additional_client_areas) override; | 129 const std::vector<gfx::Rect>& additional_client_areas) override; |
127 bool IsWindowActive(aura::Window* window) override; | 130 bool IsWindowActive(aura::Window* window) override; |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 void SetUp() override; | 172 void SetUp() override; |
170 | 173 |
171 private: | 174 private: |
172 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus); | 175 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus); |
173 }; | 176 }; |
174 | 177 |
175 } // namespace test | 178 } // namespace test |
176 } // namespace aura | 179 } // namespace aura |
177 | 180 |
178 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ | 181 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ |
OLD | NEW |