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/mus/test/wm_test_base.h" | 5 #include "ash/mus/test/wm_test_base.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/mus/bridge/wm_window_mus_test_api.h" | 10 #include "ash/mus/bridge/wm_window_mus_test_api.h" |
11 #include "ash/mus/root_window_controller.h" | 11 #include "ash/mus/root_window_controller.h" |
12 #include "ash/mus/test/wm_test_helper.h" | 12 #include "ash/mus/test/wm_test_helper.h" |
13 #include "ash/mus/window_manager.h" | 13 #include "ash/mus/window_manager.h" |
14 #include "ash/mus/window_manager_application.h" | 14 #include "ash/mus/window_manager_application.h" |
| 15 #include "base/memory/ptr_util.h" |
15 #include "services/ui/public/cpp/property_type_converters.h" | 16 #include "services/ui/public/cpp/property_type_converters.h" |
16 #include "ui/aura/mus/property_converter.h" | 17 #include "ui/aura/mus/property_converter.h" |
17 #include "ui/aura/mus/window_tree_client.h" | 18 #include "ui/aura/mus/window_tree_client.h" |
18 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
19 #include "ui/compositor/scoped_animation_duration_scale_mode.h" | 20 #include "ui/compositor/scoped_animation_duration_scale_mode.h" |
20 #include "ui/display/display.h" | 21 #include "ui/display/display.h" |
21 | 22 |
22 namespace ash { | 23 namespace ash { |
23 namespace mus { | 24 namespace mus { |
24 namespace { | 25 namespace { |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 | 169 |
169 void WmTestBase::TearDown() { | 170 void WmTestBase::TearDown() { |
170 teardown_called_ = true; | 171 teardown_called_ = true; |
171 test_helper_.reset(); | 172 test_helper_.reset(); |
172 minimum_size_lock_.reset(); | 173 minimum_size_lock_.reset(); |
173 zero_duration_mode_.reset(); | 174 zero_duration_mode_.reset(); |
174 } | 175 } |
175 | 176 |
176 } // namespace mus | 177 } // namespace mus |
177 } // namespace ash | 178 } // namespace ash |
OLD | NEW |