| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 void OnEmbed( | 83 void OnEmbed( |
| 84 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 84 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; |
| 85 void OnLostConnection(aura::WindowTreeClient* client) override; | 85 void OnLostConnection(aura::WindowTreeClient* client) override; |
| 86 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; | 86 void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; |
| 87 void OnPointerEventObserved(const ui::PointerEvent& event, | 87 void OnPointerEventObserved(const ui::PointerEvent& event, |
| 88 aura::Window* target) override; | 88 aura::Window* target) override; |
| 89 aura::PropertyConverter* GetPropertyConverter() override; | 89 aura::PropertyConverter* GetPropertyConverter() override; |
| 90 | 90 |
| 91 // WindowManagerDelegate: | 91 // WindowManagerDelegate: |
| 92 void SetWindowManagerClient(aura::WindowManagerClient* client) override; | 92 void SetWindowManagerClient(aura::WindowManagerClient* client) override; |
| 93 void OnWmConnected() override; |
| 93 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override; | 94 void OnWmSetBounds(aura::Window* window, const gfx::Rect& bounds) override; |
| 94 bool OnWmSetProperty( | 95 bool OnWmSetProperty( |
| 95 aura::Window* window, | 96 aura::Window* window, |
| 96 const std::string& name, | 97 const std::string& name, |
| 97 std::unique_ptr<std::vector<uint8_t>>* new_data) override; | 98 std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
| 98 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override; | 99 void OnWmSetModalType(aura::Window* window, ui::ModalType type) override; |
| 99 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; | 100 void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; |
| 100 aura::Window* OnWmCreateTopLevelWindow( | 101 aura::Window* OnWmCreateTopLevelWindow( |
| 101 ui::mojom::WindowType window_type, | 102 ui::mojom::WindowType window_type, |
| 102 std::map<std::string, std::vector<uint8_t>>* properties) override; | 103 std::map<std::string, std::vector<uint8_t>>* properties) override; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 bool window_tree_client_lost_connection_ = false; | 163 bool window_tree_client_lost_connection_ = false; |
| 163 | 164 |
| 164 service_manager::BinderRegistry registry_; | 165 service_manager::BinderRegistry registry_; |
| 165 | 166 |
| 166 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); | 167 DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase); |
| 167 }; | 168 }; |
| 168 | 169 |
| 169 } // namespace ui | 170 } // namespace ui |
| 170 | 171 |
| 171 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ | 172 #endif // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_ |
| OLD | NEW |