| 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/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 8 #include "ash/common/test/material_design_controller_test_api.h" | 8 #include "ash/common/test/material_design_controller_test_api.h" |
| 9 #include "ash/mus/root_window_controller.h" | 9 #include "ash/mus/root_window_controller.h" |
| 10 #include "ash/mus/test/wm_test_screen.h" | 10 #include "ash/mus/test/wm_test_screen.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 display_bounds.height() - 20); | 53 display_bounds.height() - 20); |
| 54 display.set_work_area(work_area); | 54 display.set_work_area(work_area); |
| 55 window_tree_client_setup_.InitForWindowManager( | 55 window_tree_client_setup_.InitForWindowManager( |
| 56 window_manager_app_->window_manager_.get(), | 56 window_manager_app_->window_manager_.get(), |
| 57 window_manager_app_->window_manager_.get(), display); | 57 window_manager_app_->window_manager_.get(), display); |
| 58 | 58 |
| 59 window_manager_app_->InitWindowManager( | 59 window_manager_app_->InitWindowManager( |
| 60 window_tree_client_setup_.window_tree_client()); | 60 window_tree_client_setup_.window_tree_client()); |
| 61 | 61 |
| 62 screen_->display_list()->AddDisplay(display, | 62 screen_->display_list()->AddDisplay(display, |
| 63 views::DisplayList::Type::PRIMARY); | 63 display::DisplayList::Type::PRIMARY); |
| 64 | 64 |
| 65 ui::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client()) | 65 ui::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client()) |
| 66 .CallWmNewDisplayAdded(display); | 66 .CallWmNewDisplayAdded(display); |
| 67 } | 67 } |
| 68 | 68 |
| 69 } // namespace mus | 69 } // namespace mus |
| 70 } // namespace ash | 70 } // namespace ash |
| OLD | NEW |