| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 | 147 |
| 148 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() { | 148 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() { |
| 149 return &property_converter_; | 149 return &property_converter_; |
| 150 } | 150 } |
| 151 | 151 |
| 152 void WindowServerTestBase::SetWindowManagerClient( | 152 void WindowServerTestBase::SetWindowManagerClient( |
| 153 aura::WindowManagerClient* client) { | 153 aura::WindowManagerClient* client) { |
| 154 window_manager_client_ = client; | 154 window_manager_client_ = client; |
| 155 } | 155 } |
| 156 | 156 |
| 157 void WindowServerTestBase::OnWmConnected() {} |
| 158 |
| 157 void WindowServerTestBase::OnWmSetBounds(aura::Window* window, | 159 void WindowServerTestBase::OnWmSetBounds(aura::Window* window, |
| 158 const gfx::Rect& bounds) { | 160 const gfx::Rect& bounds) { |
| 159 if (!window_manager_delegate_) | 161 if (!window_manager_delegate_) |
| 160 return; | 162 return; |
| 161 window_manager_delegate_->OnWmSetBounds(window, bounds); | 163 window_manager_delegate_->OnWmSetBounds(window, bounds); |
| 162 } | 164 } |
| 163 | 165 |
| 164 bool WindowServerTestBase::OnWmSetProperty( | 166 bool WindowServerTestBase::OnWmSetProperty( |
| 165 aura::Window* window, | 167 aura::Window* window, |
| 166 const std::string& name, | 168 const std::string& name, |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 ++iter) { | 294 ++iter) { |
| 293 if ((*iter).get() == window_tree_host) { | 295 if ((*iter).get() == window_tree_host) { |
| 294 window_tree_hosts_.erase(iter); | 296 window_tree_hosts_.erase(iter); |
| 295 return true; | 297 return true; |
| 296 } | 298 } |
| 297 } | 299 } |
| 298 return false; | 300 return false; |
| 299 } | 301 } |
| 300 | 302 |
| 301 } // namespace ui | 303 } // namespace ui |
| OLD | NEW |