| 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/common/wm_window.h" | 8 #include "ash/common/wm_window.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" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 window->GetDisplayNearestWindow().id()); | 90 window->GetDisplayNearestWindow().id()); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void AshTestImplMus::AddTransientChild(WmWindow* parent, WmWindow* window) { | 93 void AshTestImplMus::AddTransientChild(WmWindow* parent, WmWindow* window) { |
| 94 // TODO(sky): remove this as both classes can share same implementation now. | 94 // TODO(sky): remove this as both classes can share same implementation now. |
| 95 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), | 95 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), |
| 96 WmWindow::GetAuraWindow(window)); | 96 WmWindow::GetAuraWindow(window)); |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace mus | 99 } // namespace mus |
| 100 | |
| 101 // static | |
| 102 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | |
| 103 return base::MakeUnique<mus::AshTestImplMus>(); | |
| 104 } | |
| 105 | |
| 106 } // namespace ash | 100 } // namespace ash |
| OLD | NEW |