| 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/common/test/ash_test.h" | |
| 14 #include "ash/common/wm_shell.h" | |
| 15 #include "ash/common/wm_window.h" | |
| 16 #include "ash/mus/test/wm_test_base.h" | 13 #include "ash/mus/test/wm_test_base.h" |
| 17 #include "ash/mus/window_manager.h" | 14 #include "ash/mus/window_manager.h" |
| 18 #include "ash/mus/window_manager_application.h" | 15 #include "ash/mus/window_manager_application.h" |
| 16 #include "ash/test/ash_test.h" |
| 19 #include "ash/test/ash_test_base.h" | 17 #include "ash/test/ash_test_base.h" |
| 20 #include "ash/test/ash_test_helper.h" | 18 #include "ash/test/ash_test_helper.h" |
| 19 #include "ash/wm_shell.h" |
| 20 #include "ash/wm_window.h" |
| 21 #include "ui/aura/window.h" | 21 #include "ui/aura/window.h" |
| 22 #include "ui/display/screen.h" | 22 #include "ui/display/screen.h" |
| 23 | 23 |
| 24 namespace ash { | 24 namespace ash { |
| 25 | 25 |
| 26 namespace { | 26 namespace { |
| 27 | 27 |
| 28 int64_t GetDisplayId(aura::Window* window) { | 28 int64_t GetDisplayId(aura::Window* window) { |
| 29 return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id(); | 29 return display::Screen::GetScreen()->GetDisplayNearestWindow(window).id(); |
| 30 } | 30 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 TEST_F(TopLevelWindowFactoryAshTest, TopLevelNotShownOnCreate) { | 63 TEST_F(TopLevelWindowFactoryAshTest, TopLevelNotShownOnCreate) { |
| 64 std::map<std::string, std::vector<uint8_t>> properties; | 64 std::map<std::string, std::vector<uint8_t>> properties; |
| 65 std::unique_ptr<aura::Window> window(mus::CreateAndParentTopLevelWindow( | 65 std::unique_ptr<aura::Window> window(mus::CreateAndParentTopLevelWindow( |
| 66 ash_test_helper()->window_manager_app()->window_manager(), | 66 ash_test_helper()->window_manager_app()->window_manager(), |
| 67 ui::mojom::WindowType::WINDOW, &properties)); | 67 ui::mojom::WindowType::WINDOW, &properties)); |
| 68 ASSERT_TRUE(window); | 68 ASSERT_TRUE(window); |
| 69 EXPECT_FALSE(window->IsVisible()); | 69 EXPECT_FALSE(window->IsVisible()); |
| 70 } | 70 } |
| 71 | 71 |
| 72 } // namespace ash | 72 } // namespace ash |
| OLD | NEW |