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/wm/container_finder.h" | 5 #include "ash/wm/container_finder.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
10 #include "ash/test/ash_test.h" | 10 #include "ash/test/ash_test.h" |
11 #include "ash/wm_window.h" | 11 #include "ash/wm_window.h" |
| 12 #include "ui/aura/window.h" |
12 #include "ui/gfx/geometry/rect.h" | 13 #include "ui/gfx/geometry/rect.h" |
13 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
14 | 15 |
15 namespace ash { | 16 namespace ash { |
16 | 17 |
17 using ContainerFinderTest = AshTest; | 18 using ContainerFinderTest = AshTest; |
18 | 19 |
19 TEST_F(ContainerFinderTest, GetContainerForWindow) { | 20 TEST_F(ContainerFinderTest, GetContainerForWindow) { |
20 // Create a normal widget in the default container. | 21 // Create a normal widget in the default container. |
21 std::unique_ptr<views::Widget> widget = | 22 std::unique_ptr<views::Widget> widget = |
22 CreateTestWidget(gfx::Rect(1, 2, 3, 4)); | 23 CreateTestWidget(gfx::Rect(1, 2, 3, 4)); |
23 WmWindow* window = WmWindow::Get(widget->GetNativeWindow()); | 24 aura::Window* window = widget->GetNativeWindow(); |
24 | 25 |
25 // The window itself is not a container. | 26 // The window itself is not a container. |
26 EXPECT_EQ(kShellWindowId_Invalid, window->GetShellWindowId()); | 27 EXPECT_EQ(kShellWindowId_Invalid, window->id()); |
27 | 28 |
28 // Container lookup finds the default container. | 29 // Container lookup finds the default container. |
29 WmWindow* container = wm::GetContainerForWindow(window); | 30 WmWindow* container = wm::GetContainerForWindow(WmWindow::Get(window)); |
30 ASSERT_TRUE(container); | 31 ASSERT_TRUE(container); |
31 EXPECT_EQ(kShellWindowId_DefaultContainer, container->GetShellWindowId()); | 32 EXPECT_EQ(kShellWindowId_DefaultContainer, container->aura_window()->id()); |
32 } | 33 } |
33 | 34 |
34 } // namespace ash | 35 } // namespace ash |
OLD | NEW |