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" | |
8 #include "ash/common/wm_window.h" | |
9 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
10 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/test/ash_test.h" |
11 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| 11 #include "ash/wm_window.h" |
12 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
13 #include "ui/aura/test/test_window_delegate.h" | 13 #include "ui/aura/test/test_window_delegate.h" |
14 #include "ui/display/display_layout.h" | 14 #include "ui/display/display_layout.h" |
15 #include "ui/display/manager/display_manager.h" | 15 #include "ui/display/manager/display_manager.h" |
16 #include "ui/display/screen.h" | 16 #include "ui/display/screen.h" |
17 #include "ui/display/test/display_manager_test_api.h" | 17 #include "ui/display/test/display_manager_test_api.h" |
18 #include "ui/wm/core/window_util.h" | 18 #include "ui/wm/core/window_util.h" |
19 | 19 |
20 namespace ash { | 20 namespace ash { |
21 namespace { | 21 namespace { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), | 98 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), |
99 WmWindow::GetAuraWindow(window)); | 99 WmWindow::GetAuraWindow(window)); |
100 } | 100 } |
101 | 101 |
102 // static | 102 // static |
103 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | 103 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { |
104 return base::MakeUnique<AshTestImplAura>(); | 104 return base::MakeUnique<AshTestImplAura>(); |
105 } | 105 } |
106 | 106 |
107 } // namespace ash | 107 } // namespace ash |
OLD | NEW |