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

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

Issue 2897663002: chromeos: makes it possible for windows to outlive WindowTreeClient (Closed)
Patch Set: cleanup Created 3 years, 7 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/aura/test/aura_test_helper.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 "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "ui/aura/client/window_parenting_client.h" 8 #include "ui/aura/client/window_parenting_client.h"
9 #include "ui/aura/mus/property_utils.h" 9 #include "ui/aura/mus/property_utils.h"
10 #include "ui/aura/mus/window_tree_client.h" 10 #include "ui/aura/mus/window_tree_client.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 window->SetBounds(gfx::Rect(0, 0, 100, 100)); 117 window->SetBounds(gfx::Rect(0, 0, 100, 100));
118 window->Show(); 118 window->Show();
119 return window; 119 return window;
120 } 120 }
121 121
122 void AuraTestBase::EnableMusWithTestWindowTree() { 122 void AuraTestBase::EnableMusWithTestWindowTree() {
123 DCHECK(!setup_called_); 123 DCHECK(!setup_called_);
124 use_mus_ = true; 124 use_mus_ = true;
125 } 125 }
126 126
127 void AuraTestBase::DeleteWindowTreeClient() {
128 DCHECK(use_mus_);
129 helper_->DeleteWindowTreeClient();
130 }
131
127 void AuraTestBase::ConfigureBackend(BackendType type) { 132 void AuraTestBase::ConfigureBackend(BackendType type) {
128 if (type == BackendType::MUS) 133 if (type == BackendType::MUS)
129 EnableMusWithTestWindowTree(); 134 EnableMusWithTestWindowTree();
130 } 135 }
131 136
132 void AuraTestBase::RunAllPendingInMessageLoop() { 137 void AuraTestBase::RunAllPendingInMessageLoop() {
133 helper_->RunAllPendingInMessageLoop(); 138 helper_->RunAllPendingInMessageLoop();
134 } 139 }
135 140
136 void AuraTestBase::ParentWindow(Window* window) { 141 void AuraTestBase::ParentWindow(Window* window) {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 261
257 AuraTestBaseMus::~AuraTestBaseMus() {} 262 AuraTestBaseMus::~AuraTestBaseMus() {}
258 263
259 void AuraTestBaseMus::SetUp() { 264 void AuraTestBaseMus::SetUp() {
260 ConfigureBackend(test::BackendType::MUS); 265 ConfigureBackend(test::BackendType::MUS);
261 AuraTestBase::SetUp(); 266 AuraTestBase::SetUp();
262 } 267 }
263 268
264 } // namespace test 269 } // namespace test
265 } // namespace aura 270 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/aura_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698