| 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 COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| 6 #define COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 6 #define COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 void SetWindowManagerClient(WindowManagerClient* client) override; | 74 void SetWindowManagerClient(WindowManagerClient* client) override; |
| 75 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; | 75 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; |
| 76 bool OnWmSetProperty( | 76 bool OnWmSetProperty( |
| 77 Window* window, | 77 Window* window, |
| 78 const std::string& name, | 78 const std::string& name, |
| 79 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 79 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 80 Window* OnWmCreateTopLevelWindow( | 80 Window* OnWmCreateTopLevelWindow( |
| 81 std::map<std::string, std::vector<uint8_t>>* properties) override; | 81 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| 82 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, | 82 void OnWmClientJankinessChanged(const std::set<Window*>& client_windows, |
| 83 bool not_responding) override; | 83 bool not_responding) override; |
| 84 void OnWmNewDisplay(Window* window, const display::Display& display) override; |
| 84 void OnAccelerator(uint32_t id, const ui::Event& event) override; | 85 void OnAccelerator(uint32_t id, const ui::Event& event) override; |
| 85 | 86 |
| 86 // InterfaceFactory<WindowTreeClient>: | 87 // InterfaceFactory<WindowTreeClient>: |
| 87 void Create(shell::Connection* connection, | 88 void Create(shell::Connection* connection, |
| 88 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; | 89 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; |
| 89 | 90 |
| 90 // Used to receive the most recent window tree client loaded by an embed | 91 // Used to receive the most recent window tree client loaded by an embed |
| 91 // action. | 92 // action. |
| 92 WindowTreeClient* most_recent_client_; | 93 WindowTreeClient* most_recent_client_; |
| 93 | 94 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 105 WindowManagerClient* window_manager_client_; | 106 WindowManagerClient* window_manager_client_; |
| 106 | 107 |
| 107 bool window_tree_client_destroyed_; | 108 bool window_tree_client_destroyed_; |
| 108 | 109 |
| 109 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 110 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 110 }; | 111 }; |
| 111 | 112 |
| 112 } // namespace mus | 113 } // namespace mus |
| 113 | 114 |
| 114 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 115 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |