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_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
6 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <set> | 9 #include <set> |
10 | 10 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 bool OnWmSetProperty( | 83 bool OnWmSetProperty( |
84 Window* window, | 84 Window* window, |
85 const std::string& name, | 85 const std::string& name, |
86 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 86 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
87 Window* OnWmCreateTopLevelWindow( | 87 Window* OnWmCreateTopLevelWindow( |
88 std::map<std::string, std::vector<uint8_t>>* properties) override; | 88 std::map<std::string, std::vector<uint8_t>>* properties) override; |
89 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 89 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
90 bool not_responding) override; | 90 bool not_responding) override; |
91 void OnWmNewDisplay(Window* window, const display::Display& display) override; | 91 void OnWmNewDisplay(Window* window, const display::Display& display) override; |
92 void OnWmDisplayRemoved(Window* window) override; | 92 void OnWmDisplayRemoved(Window* window) override; |
| 93 void OnWmDisplayModified(const display::Display& display) override; |
93 void OnWmPerformMoveLoop(Window* window, | 94 void OnWmPerformMoveLoop(Window* window, |
94 mojom::MoveLoopSource source, | 95 mojom::MoveLoopSource source, |
95 const gfx::Point& cursor_location, | 96 const gfx::Point& cursor_location, |
96 const base::Callback<void(bool)>& on_done) override; | 97 const base::Callback<void(bool)>& on_done) override; |
97 void OnWmCancelMoveLoop(Window* window) override; | 98 void OnWmCancelMoveLoop(Window* window) override; |
98 mojom::EventResult OnAccelerator(uint32_t accelerator_id, | 99 mojom::EventResult OnAccelerator(uint32_t accelerator_id, |
99 const ui::Event& event) override; | 100 const ui::Event& event) override; |
100 | 101 |
101 // InterfaceFactory<WindowTreeClient>: | 102 // InterfaceFactory<WindowTreeClient>: |
102 void Create(const service_manager::Identity& remote_identity, | 103 void Create(const service_manager::Identity& remote_identity, |
(...skipping 19 matching lines...) Expand all Loading... |
122 WindowManagerClient* window_manager_client_; | 123 WindowManagerClient* window_manager_client_; |
123 | 124 |
124 bool window_tree_client_lost_connection_ = false; | 125 bool window_tree_client_lost_connection_ = false; |
125 | 126 |
126 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 127 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
127 }; | 128 }; |
128 | 129 |
129 } // namespace ui | 130 } // namespace ui |
130 | 131 |
131 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 132 #endif // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
OLD | NEW |