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

Side by Side Diff: ui/aura/test/aura_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 (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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 const gfx::Point& cursor_location, 215 const gfx::Point& cursor_location,
216 const base::Callback<void(bool)>& on_done) {} 216 const base::Callback<void(bool)>& on_done) {}
217 217
218 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {} 218 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {}
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 void AuraTestBase::OnWmDeactivateWindow(Window* window) {}
226
225 client::CaptureClient* AuraTestBase::GetCaptureClient() { 227 client::CaptureClient* AuraTestBase::GetCaptureClient() {
226 return helper_->capture_client(); 228 return helper_->capture_client();
227 } 229 }
228 230
229 PropertyConverter* AuraTestBase::GetPropertyConverter() { 231 PropertyConverter* AuraTestBase::GetPropertyConverter() {
230 return &property_converter_; 232 return &property_converter_;
231 } 233 }
232 234
233 AuraTestBaseWithType::AuraTestBaseWithType() {} 235 AuraTestBaseWithType::AuraTestBaseWithType() {}
234 236
235 AuraTestBaseWithType::~AuraTestBaseWithType() { 237 AuraTestBaseWithType::~AuraTestBaseWithType() {
236 DCHECK(setup_called_); 238 DCHECK(setup_called_);
237 } 239 }
238 240
239 void AuraTestBaseWithType::SetUp() { 241 void AuraTestBaseWithType::SetUp() {
240 DCHECK(!setup_called_); 242 DCHECK(!setup_called_);
241 setup_called_ = true; 243 setup_called_ = true;
242 ConfigureBackend(GetParam()); 244 ConfigureBackend(GetParam());
243 AuraTestBase::SetUp(); 245 AuraTestBase::SetUp();
244 } 246 }
245 247
246 } // namespace test 248 } // namespace test
247 } // namespace aura 249 } // namespace aura
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698