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

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

Issue 2669203002: Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient() (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « services/ui/ws/window_server_test_base.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
146 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() { 150 aura::PropertyConverter* WindowServerTestBase::GetPropertyConverter() {
147 return &property_converter_; 151 return &property_converter_;
148 } 152 }
149 153
150 void WindowServerTestBase::SetWindowManagerClient( 154 void WindowServerTestBase::SetWindowManagerClient(
151 aura::WindowManagerClient* client) { 155 aura::WindowManagerClient* client) {
152 window_manager_client_ = client; 156 window_manager_client_ = client;
153 } 157 }
154 158
155 bool WindowServerTestBase::OnWmSetBounds(aura::Window* window, 159 bool WindowServerTestBase::OnWmSetBounds(aura::Window* window,
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 ++iter) { 285 ++iter) {
282 if ((*iter).get() == window_tree_host) { 286 if ((*iter).get() == window_tree_host) {
283 window_tree_hosts_.erase(iter); 287 window_tree_hosts_.erase(iter);
284 return true; 288 return true;
285 } 289 }
286 } 290 }
287 return false; 291 return false;
288 } 292 }
289 293
290 } // namespace ui 294 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/window_server_test_base.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698