| 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_base.h" | 5 #include "ash/mus/test/wm_test_base.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/mus/root_window_controller.h" | 10 #include "ash/mus/root_window_controller.h" |
| 11 #include "ash/mus/test/wm_test_helper.h" | 11 #include "ash/mus/test/wm_test_helper.h" |
| 12 #include "ash/mus/test/wm_test_screen.h" | 12 #include "ash/mus/test/wm_test_screen.h" |
| 13 #include "ash/mus/window_manager.h" | 13 #include "ash/mus/window_manager.h" |
| 14 #include "ash/mus/window_manager_application.h" | 14 #include "ash/mus/window_manager_application.h" |
| 15 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
| 16 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
| 17 #include "components/mus/public/cpp/property_type_converters.h" | 17 #include "services/ui/public/cpp/property_type_converters.h" |
| 18 #include "components/mus/public/cpp/window_tree_client.h" | 18 #include "services/ui/public/cpp/window_tree_client.h" |
| 19 #include "ui/display/display.h" | 19 #include "ui/display/display.h" |
| 20 | 20 |
| 21 namespace ash { | 21 namespace ash { |
| 22 namespace mus { | 22 namespace mus { |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 ::mus::mojom::WindowType MusWindowTypeFromWmWindowType( | 25 ::mus::mojom::WindowType MusWindowTypeFromWmWindowType( |
| 26 ui::wm::WindowType wm_window_type) { | 26 ui::wm::WindowType wm_window_type) { |
| 27 switch (wm_window_type) { | 27 switch (wm_window_type) { |
| 28 case ui::wm::WINDOW_TYPE_UNKNOWN: | 28 case ui::wm::WINDOW_TYPE_UNKNOWN: |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 ->window_manager() | 204 ->window_manager() |
| 205 ->GetRootWindowControllers(); | 205 ->GetRootWindowControllers(); |
| 206 std::vector<RootWindowController*> ordered_roots; | 206 std::vector<RootWindowController*> ordered_roots; |
| 207 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); | 207 ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end()); |
| 208 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); | 208 std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId); |
| 209 return ordered_roots; | 209 return ordered_roots; |
| 210 } | 210 } |
| 211 | 211 |
| 212 } // namespace mus | 212 } // namespace mus |
| 213 } // namespace ash | 213 } // namespace ash |
| OLD | NEW |