OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/display/display_manager.h" | 5 #include "ash/display/display_manager.h" |
6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
8 #include "ui/aura/test/test_window_delegate.h" | 8 #include "ui/aura/test/test_window_delegate.h" |
9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
10 | 10 |
11 namespace ash { | 11 namespace ash { |
12 | 12 |
13 class ScreenAshTest : public test::AshTestBase { | 13 class ScreenAshTest : public test::AshTestBase { |
14 public: | 14 public: |
15 ScreenAshTest() {} | 15 ScreenAshTest() {} |
16 ~ScreenAshTest() override {} | 16 ~ScreenAshTest() override {} |
17 | 17 |
18 static gfx::Screen* Screen() { return Shell::GetScreen(); } | |
19 | |
20 private: | 18 private: |
21 DISALLOW_COPY_AND_ASSIGN(ScreenAshTest); | 19 DISALLOW_COPY_AND_ASSIGN(ScreenAshTest); |
22 }; | 20 }; |
23 | 21 |
24 // Tests that ScreenAsh::GetWindowAtScreenPoint() returns the correct window on | 22 // Tests that ScreenAsh::GetWindowAtScreenPoint() returns the correct window on |
25 // the correct display. | 23 // the correct display. |
26 TEST_F(ScreenAshTest, TestGetWindowAtScreenPoint) { | 24 TEST_F(ScreenAshTest, TestGetWindowAtScreenPoint) { |
27 if (!SupportsMultipleDisplays()) | 25 if (!SupportsMultipleDisplays()) |
28 return; | 26 return; |
29 | 27 |
30 UpdateDisplay("200x200,400x400"); | 28 UpdateDisplay("200x200,400x400"); |
31 | 29 |
32 aura::test::TestWindowDelegate delegate; | 30 aura::test::TestWindowDelegate delegate; |
33 scoped_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate( | 31 scoped_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate( |
34 &delegate, 0, gfx::Rect(0, 0, 200, 200))); | 32 &delegate, 0, gfx::Rect(0, 0, 200, 200))); |
35 | 33 |
36 scoped_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate( | 34 scoped_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate( |
37 &delegate, 1, gfx::Rect(200, 200, 100, 100))); | 35 &delegate, 1, gfx::Rect(200, 200, 100, 100))); |
38 | 36 |
39 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow()); | 37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow()); |
40 | 38 |
41 EXPECT_EQ(win1.get(), Screen()->GetWindowAtScreenPoint(gfx::Point(50, 60))); | 39 EXPECT_EQ(win1.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint( |
42 EXPECT_EQ(win2.get(), Screen()->GetWindowAtScreenPoint(gfx::Point(250, 260))); | 40 gfx::Point(50, 60))); |
| 41 EXPECT_EQ(win2.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint( |
| 42 gfx::Point(250, 260))); |
43 } | 43 } |
44 | 44 |
45 } // namespace ash | 45 } // namespace ash |
OLD | NEW |