| 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/top_level_window_factory.h" | 5 #include "ash/mus/top_level_window_factory.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <string> | 10 #include <string> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 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 "ash/shell.h" | 15 #include "ash/shell.h" |
| 16 #include "ash/test/ash_test.h" | |
| 17 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
| 18 #include "ash/test/ash_test_helper.h" | 17 #include "ash/test/ash_test_helper.h" |
| 19 #include "ash/wm/window_properties.h" | 18 #include "ash/wm/window_properties.h" |
| 20 #include "services/ui/public/cpp/property_type_converters.h" | 19 #include "services/ui/public/cpp/property_type_converters.h" |
| 21 #include "ui/aura/mus/property_converter.h" | 20 #include "ui/aura/mus/property_converter.h" |
| 22 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 23 #include "ui/display/screen.h" | 22 #include "ui/display/screen.h" |
| 24 #include "ui/gfx/geometry/rect.h" | 23 #include "ui/gfx/geometry/rect.h" |
| 25 #include "ui/gfx/test/gfx_util.h" | 24 #include "ui/gfx/test/gfx_util.h" |
| 26 #include "ui/wm/core/window_util.h" | 25 #include "ui/wm/core/window_util.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 aura::Window* window = CreateAndParentTopLevelWindow( | 108 aura::Window* window = CreateAndParentTopLevelWindow( |
| 110 window_manager, ui::mojom::WindowType::WINDOW, &properties); | 109 window_manager, ui::mojom::WindowType::WINDOW, &properties); |
| 111 ASSERT_TRUE(window->parent()); | 110 ASSERT_TRUE(window->parent()); |
| 112 EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); | 111 EXPECT_EQ(kShellWindowId_DefaultContainer, window->parent()->id()); |
| 113 EXPECT_EQ(bounds, window->bounds()); | 112 EXPECT_EQ(bounds, window->bounds()); |
| 114 EXPECT_EQ(WidgetCreationType::FOR_CLIENT, | 113 EXPECT_EQ(WidgetCreationType::FOR_CLIENT, |
| 115 window->GetProperty(kWidgetCreationTypeKey)); | 114 window->GetProperty(kWidgetCreationTypeKey)); |
| 116 } | 115 } |
| 117 | 116 |
| 118 } // namespace ash | 117 } // namespace ash |
| OLD | NEW |