| 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/ash_test_impl_mus.h" | 5 #include "ash/mus/test/ash_test_impl_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/test/ash_test.h" | 7 #include "ash/common/test/ash_test.h" |
| 8 #include "ash/mus/bridge/wm_window_mus.h" | 8 #include "ash/mus/bridge/wm_window_mus.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "services/ui/public/cpp/property_type_converters.h" | 10 #include "services/ui/public/cpp/property_type_converters.h" |
| 11 #include "services/ui/public/cpp/window.h" | |
| 12 #include "services/ui/public/cpp/window_property.h" | |
| 13 #include "services/ui/public/interfaces/window_manager.mojom.h" | 11 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 14 #include "ui/wm/core/window_util.h" | 12 #include "ui/wm/core/window_util.h" |
| 15 | 13 |
| 16 namespace ash { | 14 namespace ash { |
| 17 namespace mus { | 15 namespace mus { |
| 18 namespace { | 16 namespace { |
| 19 | 17 |
| 20 // WmTestBase is abstract as TestBody() is pure virtual (the various TEST | 18 // WmTestBase is abstract as TestBody() is pure virtual (the various TEST |
| 21 // macros have the implementation). In order to create WmTestBase we have to | 19 // macros have the implementation). In order to create WmTestBase we have to |
| 22 // subclass with an empty implementation of TestBody(). That's ok as the class | 20 // subclass with an empty implementation of TestBody(). That's ok as the class |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 101 } |
| 104 | 102 |
| 105 } // namespace mus | 103 } // namespace mus |
| 106 | 104 |
| 107 // static | 105 // static |
| 108 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | 106 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { |
| 109 return base::MakeUnique<mus::AshTestImplMus>(); | 107 return base::MakeUnique<mus::AshTestImplMus>(); |
| 110 } | 108 } |
| 111 | 109 |
| 112 } // namespace ash | 110 } // namespace ash |
| OLD | NEW |