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 SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 5 #ifndef SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 6 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 aura::Window* OnWmCreateTopLevelWindow( | 97 aura::Window* OnWmCreateTopLevelWindow( |
98 ui::mojom::WindowType window_type, | 98 ui::mojom::WindowType window_type, |
99 std::map<std::string, std::vector<uint8_t>>* properties) override; | 99 std::map<std::string, std::vector<uint8_t>>* properties) override; |
100 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, | 100 void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, |
101 bool not_responding) override; | 101 bool not_responding) override; |
102 void OnWmWillCreateDisplay(const display::Display& display) override; | 102 void OnWmWillCreateDisplay(const display::Display& display) override; |
103 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, | 103 void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
104 const display::Display& display) override; | 104 const display::Display& display) override; |
105 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; | 105 void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; |
106 void OnWmDisplayModified(const display::Display& display) override; | 106 void OnWmDisplayModified(const display::Display& display) override; |
107 mojom::EventResult OnAccelerator(uint32_t accelerator_id, | 107 mojom::EventResult OnAccelerator( |
108 const ui::Event& event) override; | 108 uint32_t accelerator_id, |
| 109 const ui::Event& event, |
| 110 std::unordered_map<std::string, std::vector<uint8_t>>* properties) |
| 111 override; |
109 void OnWmPerformMoveLoop(aura::Window* window, | 112 void OnWmPerformMoveLoop(aura::Window* window, |
110 mojom::MoveLoopSource source, | 113 mojom::MoveLoopSource source, |
111 const gfx::Point& cursor_location, | 114 const gfx::Point& cursor_location, |
112 const base::Callback<void(bool)>& on_done) override; | 115 const base::Callback<void(bool)>& on_done) override; |
113 void OnWmCancelMoveLoop(aura::Window* window) override; | 116 void OnWmCancelMoveLoop(aura::Window* window) override; |
114 void OnWmSetClientArea( | 117 void OnWmSetClientArea( |
115 aura::Window* window, | 118 aura::Window* window, |
116 const gfx::Insets& insets, | 119 const gfx::Insets& insets, |
117 const std::vector<gfx::Rect>& additional_client_areas) override; | 120 const std::vector<gfx::Rect>& additional_client_areas) override; |
118 bool IsWindowActive(aura::Window* window) override; | 121 bool IsWindowActive(aura::Window* window) override; |
(...skipping 29 matching lines...) Expand all Loading... |
148 aura::WindowManagerClient* window_manager_client_ = nullptr; | 151 aura::WindowManagerClient* window_manager_client_ = nullptr; |
149 | 152 |
150 bool window_tree_client_lost_connection_ = false; | 153 bool window_tree_client_lost_connection_ = false; |
151 | 154 |
152 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 155 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
153 }; | 156 }; |
154 | 157 |
155 } // namespace ui | 158 } // namespace ui |
156 | 159 |
157 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 160 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
OLD | NEW |