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/test/wm_shell_test_api.h" | |
8 #include "ash/common/wm_shell.h" | |
9 #include "ash/common/wm_window.h" | |
10 #include "ash/mus/screen_mus.h" | 7 #include "ash/mus/screen_mus.h" |
11 #include "ash/mus/window_manager.h" | 8 #include "ash/mus/window_manager.h" |
12 #include "ash/mus/window_manager_application.h" | 9 #include "ash/mus/window_manager_application.h" |
13 #include "ash/test/test_shell_delegate.h" | 10 #include "ash/test/test_shell_delegate.h" |
| 11 #include "ash/test/wm_shell_test_api.h" |
| 12 #include "ash/wm_shell.h" |
| 13 #include "ash/wm_window.h" |
14 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
15 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/strings/string_number_conversions.h" | 16 #include "base/strings/string_number_conversions.h" |
17 #include "base/strings/string_split.h" | 17 #include "base/strings/string_split.h" |
18 #include "base/test/sequenced_worker_pool_owner.h" | 18 #include "base/test/sequenced_worker_pool_owner.h" |
19 #include "services/ui/public/cpp/property_type_converters.h" | 19 #include "services/ui/public/cpp/property_type_converters.h" |
20 #include "ui/aura/mus/window_tree_client.h" | 20 #include "ui/aura/mus/window_tree_client.h" |
21 #include "ui/aura/test/env_test_helper.h" | 21 #include "ui/aura/test/env_test_helper.h" |
22 #include "ui/aura/test/mus/window_tree_client_private.h" | 22 #include "ui/aura/test/mus/window_tree_client_private.h" |
23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 const bool is_primary = | 185 const bool is_primary = |
186 screen->display_list().FindDisplayById(updated_display.id()) == | 186 screen->display_list().FindDisplayById(updated_display.id()) == |
187 screen->display_list().GetPrimaryDisplayIterator(); | 187 screen->display_list().GetPrimaryDisplayIterator(); |
188 screen->display_list().UpdateDisplay( | 188 screen->display_list().UpdateDisplay( |
189 updated_display, is_primary ? display::DisplayList::Type::PRIMARY | 189 updated_display, is_primary ? display::DisplayList::Type::PRIMARY |
190 : display::DisplayList::Type::NOT_PRIMARY); | 190 : display::DisplayList::Type::NOT_PRIMARY); |
191 } | 191 } |
192 | 192 |
193 } // namespace mus | 193 } // namespace mus |
194 } // namespace ash | 194 } // namespace ash |
OLD | NEW |