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