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

Side by Side Diff: ui/aura/test/aura_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 | « ui/aura/test/aura_test_base.h ('k') | ui/views/mus/mus_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 (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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 221
222 void AuraTestBase::OnWmSetClientArea( 222 void AuraTestBase::OnWmSetClientArea(
223 Window* window, 223 Window* window,
224 const gfx::Insets& insets, 224 const gfx::Insets& insets,
225 const std::vector<gfx::Rect>& additional_client_areas) {} 225 const std::vector<gfx::Rect>& additional_client_areas) {}
226 226
227 bool AuraTestBase::IsWindowActive(aura::Window* window) { return false; } 227 bool AuraTestBase::IsWindowActive(aura::Window* window) { return false; }
228 228
229 void AuraTestBase::OnWmDeactivateWindow(Window* window) {} 229 void AuraTestBase::OnWmDeactivateWindow(Window* window) {}
230 230
231 client::CaptureClient* AuraTestBase::GetCaptureClient() {
232 return helper_->capture_client();
233 }
234
231 PropertyConverter* AuraTestBase::GetPropertyConverter() { 235 PropertyConverter* AuraTestBase::GetPropertyConverter() {
232 return &property_converter_; 236 return &property_converter_;
233 } 237 }
234 238
235 AuraTestBaseWithType::AuraTestBaseWithType() {} 239 AuraTestBaseWithType::AuraTestBaseWithType() {}
236 240
237 AuraTestBaseWithType::~AuraTestBaseWithType() { 241 AuraTestBaseWithType::~AuraTestBaseWithType() {
238 DCHECK(setup_called_); 242 DCHECK(setup_called_);
239 } 243 }
240 244
241 void AuraTestBaseWithType::SetUp() { 245 void AuraTestBaseWithType::SetUp() {
242 DCHECK(!setup_called_); 246 DCHECK(!setup_called_);
243 setup_called_ = true; 247 setup_called_ = true;
244 ConfigureBackend(GetParam()); 248 ConfigureBackend(GetParam());
245 AuraTestBase::SetUp(); 249 AuraTestBase::SetUp();
246 } 250 }
247 251
248 AuraTestBaseMus::AuraTestBaseMus() {} 252 AuraTestBaseMus::AuraTestBaseMus() {}
249 253
250 AuraTestBaseMus::~AuraTestBaseMus() {} 254 AuraTestBaseMus::~AuraTestBaseMus() {}
251 255
252 void AuraTestBaseMus::SetUp() { 256 void AuraTestBaseMus::SetUp() {
253 ConfigureBackend(test::BackendType::MUS); 257 ConfigureBackend(test::BackendType::MUS);
254 AuraTestBase::SetUp(); 258 AuraTestBase::SetUp();
255 } 259 }
256 260
257 } // namespace test 261 } // namespace test
258 } // namespace aura 262 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/views/mus/mus_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698