Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: ash/common/wm/container_finder_unittest.cc

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/common/wm/container_finder.h" 5 #include "ash/common/wm/container_finder.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/test/ash_test.h" 9 #include "ash/common/test/ash_test.h"
10 #include "ash/common/wm_lookup.h"
11 #include "ash/common/wm_window.h" 10 #include "ash/common/wm_window.h"
12 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ui/gfx/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
14 #include "ui/views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
15 14
16 namespace ash { 15 namespace ash {
17 16
18 using ContainerFinderTest = AshTest; 17 using ContainerFinderTest = AshTest;
19 18
20 TEST_F(ContainerFinderTest, GetContainerForWindow) { 19 TEST_F(ContainerFinderTest, GetContainerForWindow) {
21 // Create a normal widget in the default container. 20 // Create a normal widget in the default container.
22 std::unique_ptr<views::Widget> widget = 21 std::unique_ptr<views::Widget> widget =
23 CreateTestWidget(gfx::Rect(1, 2, 3, 4)); 22 CreateTestWidget(gfx::Rect(1, 2, 3, 4));
24 WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get()); 23 WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
25 24
26 // The window itself is not a container. 25 // The window itself is not a container.
27 EXPECT_EQ(kShellWindowId_Invalid, window->GetShellWindowId()); 26 EXPECT_EQ(kShellWindowId_Invalid, window->GetShellWindowId());
28 27
29 // Container lookup finds the default container. 28 // Container lookup finds the default container.
30 WmWindow* container = wm::GetContainerForWindow(window); 29 WmWindow* container = wm::GetContainerForWindow(window);
31 ASSERT_TRUE(container); 30 ASSERT_TRUE(container);
32 EXPECT_EQ(kShellWindowId_DefaultContainer, container->GetShellWindowId()); 31 EXPECT_EQ(kShellWindowId_DefaultContainer, container->GetShellWindowId());
33 } 32 }
34 33
35 } // namespace ash 34 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wallpaper/wallpaper_widget_controller.cc ('k') | ash/common/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698