| 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 #include "services/ui/ws/window_server_test_base.h" | 5 #include "services/ui/ws/window_server_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 aura::WindowTreeHostMus* window_tree_host) { | 136 aura::WindowTreeHostMus* window_tree_host) { |
| 137 if (!DeleteWindowTreeHost(window_tree_host)) { | 137 if (!DeleteWindowTreeHost(window_tree_host)) { |
| 138 // Assume a subclass called Embed() and wants us to destroy it. | 138 // Assume a subclass called Embed() and wants us to destroy it. |
| 139 delete window_tree_host; | 139 delete window_tree_host; |
| 140 } | 140 } |
| 141 } | 141 } |
| 142 | 142 |
| 143 void WindowServerTestBase::OnPointerEventObserved(const ui::PointerEvent& event, | 143 void WindowServerTestBase::OnPointerEventObserved(const ui::PointerEvent& event, |
| 144 aura::Window* target) {} | 144 aura::Window* target) {} |
| 145 | 145 |
| 146 aura::client::CaptureClient* WindowServerTestBase::GetCaptureClient() { | |
| 147 return wm_state_.capture_controller(); | |
| 148 } | |
| 149 | |
| 150 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() { | 146 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() { |
| 151 return &property_converter_; | 147 return &property_converter_; |
| 152 } | 148 } |
| 153 | 149 |
| 154 void WindowServerTestBase::SetWindowManagerClient( | 150 void WindowServerTestBase::SetWindowManagerClient( |
| 155 aura::WindowManagerClient* client) { | 151 aura::WindowManagerClient* client) { |
| 156 window_manager_client_ = client; | 152 window_manager_client_ = client; |
| 157 } | 153 } |
| 158 | 154 |
| 159 bool WindowServerTestBase::OnWmSetBounds(aura::Window* window, | 155 bool WindowServerTestBase::OnWmSetBounds(aura::Window* window, |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 ++iter) { | 281 ++iter) { |
| 286 if ((*iter).get() == window_tree_host) { | 282 if ((*iter).get() == window_tree_host) { |
| 287 window_tree_hosts_.erase(iter); | 283 window_tree_hosts_.erase(iter); |
| 288 return true; | 284 return true; |
| 289 } | 285 } |
| 290 } | 286 } |
| 291 return false; | 287 return false; |
| 292 } | 288 } |
| 293 | 289 |
| 294 } // namespace ui | 290 } // namespace ui |
| OLD | NEW |