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

Unified Diff: ui/aura/test/aura_test_base.cc

Issue 2471033005: Adds DesktopWindowTreeHostMus (Closed)
Patch Set: fix Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 8498e38248bb06e80cb4f5ee004dca64d0110d7a..2af73e871456e967df37a9f496f1d7b52a32feb8 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -110,8 +110,10 @@ void AuraTestBase::SetUp() {
ui::InitializeContextFactoryForTests(enable_pixel_output);
helper_.reset(new AuraTestHelper(&message_loop_));
- if (use_mus_)
- helper_->EnableMus(window_tree_client_delegate_, window_manager_delegate_);
+ if (use_mus_) {
+ helper_->EnableMusWithTestWindowTree(window_tree_client_delegate_,
+ window_manager_delegate_);
+ }
helper_->SetUp(context_factory);
}
@@ -141,14 +143,14 @@ Window* AuraTestBase::CreateNormalWindow(int id, Window* parent,
return window;
}
-void AuraTestBase::EnableMus() {
+void AuraTestBase::EnableMusWithTestWindowTree() {
DCHECK(!setup_called_);
use_mus_ = true;
}
void AuraTestBase::ConfigureBackend(BackendType type) {
if (type == BackendType::MUS)
- EnableMus();
+ EnableMusWithTestWindowTree();
}
void AuraTestBase::RunAllPendingInMessageLoop() {

Powered by Google App Engine
This is Rietveld 408576698