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

Side by Side Diff: ui/aura/test/aura_test_base.cc

Issue 2657873006: 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/aura/test/aura_test_base.h" 5 #include "ui/aura/test/aura_test_base.h"
6 6
7 #include "ui/aura/client/window_parenting_client.h" 7 #include "ui/aura/client/window_parenting_client.h"
8 #include "ui/aura/mus/property_utils.h" 8 #include "ui/aura/mus/property_utils.h"
9 #include "ui/aura/mus/window_tree_client.h" 9 #include "ui/aura/mus/window_tree_client.h"
10 #include "ui/aura/mus/window_tree_host_mus.h" 10 #include "ui/aura/mus/window_tree_host_mus.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 void AuraTestBase::OnWmSetClientArea( 220 void AuraTestBase::OnWmSetClientArea(
221 Window* window, 221 Window* window,
222 const gfx::Insets& insets, 222 const gfx::Insets& insets,
223 const std::vector<gfx::Rect>& additional_client_areas) {} 223 const std::vector<gfx::Rect>& additional_client_areas) {}
224 224
225 bool AuraTestBase::IsWindowActive(aura::Window* window) { return false; } 225 bool AuraTestBase::IsWindowActive(aura::Window* window) { return false; }
226 226
227 void AuraTestBase::OnWmDeactivateWindow(Window* window) {} 227 void AuraTestBase::OnWmDeactivateWindow(Window* window) {}
228 228
229 client::CaptureClient* AuraTestBase::GetCaptureClient() {
230 return helper_->capture_client();
231 }
232
233 PropertyConverter* AuraTestBase::GetPropertyConverter() { 229 PropertyConverter* AuraTestBase::GetPropertyConverter() {
234 return &property_converter_; 230 return &property_converter_;
235 } 231 }
236 232
237 AuraTestBaseWithType::AuraTestBaseWithType() {} 233 AuraTestBaseWithType::AuraTestBaseWithType() {}
238 234
239 AuraTestBaseWithType::~AuraTestBaseWithType() { 235 AuraTestBaseWithType::~AuraTestBaseWithType() {
240 DCHECK(setup_called_); 236 DCHECK(setup_called_);
241 } 237 }
242 238
243 void AuraTestBaseWithType::SetUp() { 239 void AuraTestBaseWithType::SetUp() {
244 DCHECK(!setup_called_); 240 DCHECK(!setup_called_);
245 setup_called_ = true; 241 setup_called_ = true;
246 ConfigureBackend(GetParam()); 242 ConfigureBackend(GetParam());
247 AuraTestBase::SetUp(); 243 AuraTestBase::SetUp();
248 } 244 }
249 245
250 } // namespace test 246 } // namespace test
251 } // namespace aura 247 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698