| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/test/ash_test_impl_aura.h" | 5 #include "ash/test/ash_test_impl_aura.h" |
| 6 | 6 |
| 7 #include "ash/common/test/ash_test.h" | 7 #include "ash/common/test/ash_test.h" |
| 8 #include "ash/common/wm_window.h" | 8 #include "ash/common/wm_window.h" |
| 9 #include "ash/mus/test/ash_test_impl_mus.h" |
| 10 #include "ash/public/cpp/config.h" |
| 9 #include "ash/screen_util.h" | 11 #include "ash/screen_util.h" |
| 10 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 11 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 14 #include "ash/test/ash_test_helper.h" |
| 12 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 13 #include "ui/aura/test/test_window_delegate.h" | 16 #include "ui/aura/test/test_window_delegate.h" |
| 14 #include "ui/display/display_layout.h" | 17 #include "ui/display/display_layout.h" |
| 15 #include "ui/display/manager/display_manager.h" | 18 #include "ui/display/manager/display_manager.h" |
| 16 #include "ui/display/screen.h" | 19 #include "ui/display/screen.h" |
| 17 #include "ui/display/test/display_manager_test_api.h" | 20 #include "ui/display/test/display_manager_test_api.h" |
| 18 #include "ui/wm/core/window_util.h" | 21 #include "ui/wm/core/window_util.h" |
| 19 | 22 |
| 20 namespace ash { | 23 namespace ash { |
| 21 namespace { | 24 namespace { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 init_params->context = WmWindow::GetAuraWindow(window); | 97 init_params->context = WmWindow::GetAuraWindow(window); |
| 95 } | 98 } |
| 96 | 99 |
| 97 void AshTestImplAura::AddTransientChild(WmWindow* parent, WmWindow* window) { | 100 void AshTestImplAura::AddTransientChild(WmWindow* parent, WmWindow* window) { |
| 98 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), | 101 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), |
| 99 WmWindow::GetAuraWindow(window)); | 102 WmWindow::GetAuraWindow(window)); |
| 100 } | 103 } |
| 101 | 104 |
| 102 // static | 105 // static |
| 103 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | 106 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { |
| 104 return base::MakeUnique<AshTestImplAura>(); | 107 if (test::AshTestHelper::config() == Config::CLASSIC) |
| 108 return base::MakeUnique<AshTestImplAura>(); |
| 109 |
| 110 return base::MakeUnique<mus::AshTestImplMus>(); |
| 105 } | 111 } |
| 106 | 112 |
| 107 } // namespace ash | 113 } // namespace ash |
| OLD | NEW |