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