| 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_helper.h" | 5 #include "ash/mus/test/wm_test_helper.h" |
| 6 | 6 |
| 7 #include "ash/mus/root_window_controller.h" | 7 #include "ash/mus/root_window_controller.h" |
| 8 #include "ash/mus/test/wm_test_screen.h" | 8 #include "ash/mus/test/wm_test_screen.h" |
| 9 #include "ash/mus/window_manager.h" | 9 #include "ash/mus/window_manager.h" |
| 10 #include "ash/mus/window_manager_application.h" | 10 #include "ash/mus/window_manager_application.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 13 #include "components/mus/public/cpp/property_type_converters.h" | 13 #include "services/ui/public/cpp/property_type_converters.h" |
| 14 #include "components/mus/public/cpp/tests/window_tree_client_private.h" | 14 #include "services/ui/public/cpp/tests/window_tree_client_private.h" |
| 15 #include "components/mus/public/cpp/window_tree_client.h" | 15 #include "services/ui/public/cpp/window_tree_client.h" |
| 16 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 namespace mus { | 19 namespace mus { |
| 20 | 20 |
| 21 WmTestHelper::WmTestHelper() {} | 21 WmTestHelper::WmTestHelper() {} |
| 22 | 22 |
| 23 WmTestHelper::~WmTestHelper() {} | 23 WmTestHelper::~WmTestHelper() {} |
| 24 | 24 |
| 25 void WmTestHelper::Init() { | 25 void WmTestHelper::Init() { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 46 | 46 |
| 47 screen_->display_list()->AddDisplay(display, | 47 screen_->display_list()->AddDisplay(display, |
| 48 views::DisplayList::Type::PRIMARY); | 48 views::DisplayList::Type::PRIMARY); |
| 49 | 49 |
| 50 ::mus::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client()) | 50 ::mus::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client()) |
| 51 .CallWmNewDisplayAdded(display); | 51 .CallWmNewDisplayAdded(display); |
| 52 } | 52 } |
| 53 | 53 |
| 54 } // namespace mus | 54 } // namespace mus |
| 55 } // namespace ash | 55 } // namespace ash |
| OLD | NEW |