| 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 "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h" | 10 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 void OnConnectionLost(WindowTreeConnection* connection) override; | 69 void OnConnectionLost(WindowTreeConnection* connection) override; |
| 70 | 70 |
| 71 // WindowManagerDelegate: | 71 // WindowManagerDelegate: |
| 72 void SetWindowManagerClient(WindowManagerClient* client) override; | 72 void SetWindowManagerClient(WindowManagerClient* client) override; |
| 73 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; | 73 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; |
| 74 bool OnWmSetProperty(Window* window, | 74 bool OnWmSetProperty(Window* window, |
| 75 const std::string& name, | 75 const std::string& name, |
| 76 scoped_ptr<std::vector<uint8_t>>* new_data) override; | 76 scoped_ptr<std::vector<uint8_t>>* new_data) override; |
| 77 Window* OnWmCreateTopLevelWindow( | 77 Window* OnWmCreateTopLevelWindow( |
| 78 std::map<std::string, std::vector<uint8_t>>* properties) override; | 78 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| 79 void OnAccelerator(uint32_t id, mojom::EventPtr event) override; | 79 void OnAccelerator(uint32_t id, const ui::Event& event) override; |
| 80 | 80 |
| 81 // InterfaceFactory<WindowTreeClient>: | 81 // InterfaceFactory<WindowTreeClient>: |
| 82 void Create(mojo::Connection* connection, | 82 void Create(mojo::Connection* connection, |
| 83 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; | 83 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; |
| 84 | 84 |
| 85 // Used to receive the most recent window tree connection loaded by an embed | 85 // Used to receive the most recent window tree connection loaded by an embed |
| 86 // action. | 86 // action. |
| 87 WindowTreeConnection* most_recent_connection_; | 87 WindowTreeConnection* most_recent_connection_; |
| 88 | 88 |
| 89 private: | 89 private: |
| (...skipping 10 matching lines...) Expand all Loading... |
| 100 WindowManagerClient* window_manager_client_; | 100 WindowManagerClient* window_manager_client_; |
| 101 | 101 |
| 102 bool window_tree_connection_destroyed_; | 102 bool window_tree_connection_destroyed_; |
| 103 | 103 |
| 104 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 104 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 105 }; | 105 }; |
| 106 | 106 |
| 107 } // namespace mus | 107 } // namespace mus |
| 108 | 108 |
| 109 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 109 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |