| 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/window_manager_delegate.h" | 10 #include "components/mus/public/cpp/window_manager_delegate.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 | 66 |
| 67 // ApplicationDelegate: | 67 // ApplicationDelegate: |
| 68 bool ConfigureIncomingConnection( | 68 bool ConfigureIncomingConnection( |
| 69 mojo::ApplicationConnection* connection) override; | 69 mojo::ApplicationConnection* connection) override; |
| 70 | 70 |
| 71 // WindowTreeDelegate: | 71 // WindowTreeDelegate: |
| 72 void OnEmbed(Window* root) override; | 72 void OnEmbed(Window* root) override; |
| 73 void OnConnectionLost(WindowTreeConnection* connection) override; | 73 void OnConnectionLost(WindowTreeConnection* connection) override; |
| 74 | 74 |
| 75 // WindowManagerDelegate: | 75 // WindowManagerDelegate: |
| 76 void SetWindowManagerClient(WindowManagerClient* client) override; |
| 76 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; | 77 bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override; |
| 77 bool OnWmSetProperty(Window* window, | 78 bool OnWmSetProperty(Window* window, |
| 78 const std::string& name, | 79 const std::string& name, |
| 79 scoped_ptr<std::vector<uint8_t>>* new_data) override; | 80 scoped_ptr<std::vector<uint8_t>>* new_data) override; |
| 80 Window* OnWmCreateTopLevelWindow( | 81 Window* OnWmCreateTopLevelWindow( |
| 81 std::map<std::string, std::vector<uint8_t>>* properties) override; | 82 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| 82 | 83 |
| 83 // InterfaceFactory<WindowTreeClient>: | 84 // InterfaceFactory<WindowTreeClient>: |
| 84 void Create(mojo::ApplicationConnection* connection, | 85 void Create(mojo::ApplicationConnection* connection, |
| 85 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; | 86 mojo::InterfaceRequest<mojom::WindowTreeClient> request) override; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 100 WindowManagerDelegate* window_manager_delegate_; | 101 WindowManagerDelegate* window_manager_delegate_; |
| 101 | 102 |
| 102 bool window_tree_connection_destroyed_; | 103 bool window_tree_connection_destroyed_; |
| 103 | 104 |
| 104 MOJO_DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 105 MOJO_DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 105 }; | 106 }; |
| 106 | 107 |
| 107 } // namespace mus | 108 } // namespace mus |
| 108 | 109 |
| 109 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ | 110 #endif // COMPONENTS_MUS_PUBLIC_CPP_TESTS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |