Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Side by Side Diff: services/ui/ws/window_server_test_base.cc

Issue 2568303006: aura-mus: Implement Deactivate(). (Closed)
Patch Set: Prune comments and other debugging gunk. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 void WindowServerTestBase::OnWmSetClientArea( 255 void WindowServerTestBase::OnWmSetClientArea(
256 aura::Window* window, 256 aura::Window* window,
257 const gfx::Insets& insets, 257 const gfx::Insets& insets,
258 const std::vector<gfx::Rect>& additional_client_areas) { 258 const std::vector<gfx::Rect>& additional_client_areas) {
259 if (window_manager_delegate_) { 259 if (window_manager_delegate_) {
260 window_manager_delegate_->OnWmSetClientArea(window, insets, 260 window_manager_delegate_->OnWmSetClientArea(window, insets,
261 additional_client_areas); 261 additional_client_areas);
262 } 262 }
263 } 263 }
264 264
265 void WindowServerTestBase::OnWmDeactivateWindow(aura::Window* window) {
266 if (window_manager_delegate_)
267 window_manager_delegate_->OnWmDeactivateWindow(window);
268 }
269
265 void WindowServerTestBase::Create( 270 void WindowServerTestBase::Create(
266 const service_manager::Identity& remote_identity, 271 const service_manager::Identity& remote_identity,
267 mojom::WindowTreeClientRequest request) { 272 mojom::WindowTreeClientRequest request) {
268 window_tree_clients_.push_back(base::MakeUnique<aura::WindowTreeClient>( 273 window_tree_clients_.push_back(base::MakeUnique<aura::WindowTreeClient>(
269 connector(), this, nullptr, std::move(request))); 274 connector(), this, nullptr, std::move(request)));
270 } 275 }
271 276
272 bool WindowServerTestBase::DeleteWindowTreeHost( 277 bool WindowServerTestBase::DeleteWindowTreeHost(
273 aura::WindowTreeHostMus* window_tree_host) { 278 aura::WindowTreeHostMus* window_tree_host) {
274 for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end(); 279 for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end();
275 ++iter) { 280 ++iter) {
276 if ((*iter).get() == window_tree_host) { 281 if ((*iter).get() == window_tree_host) {
277 window_tree_hosts_.erase(iter); 282 window_tree_hosts_.erase(iter);
278 return true; 283 return true;
279 } 284 }
280 } 285 }
281 return false; 286 return false;
282 } 287 }
283 288
284 } // namespace ui 289 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698