ash/display/screen_ash_unittest.cc - Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/display/screen_ash_unittest.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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

« no previous file with comments | « ash/display/screen_ash.cc ('k') | ash/display/screen_orientation_controller_chromeos.h » ('j') | no next file with comments »

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

(...skipping 18 matching lines...) Expand all Loading...
29	29

30 aura::test::TestWindowDelegate delegate;	30 aura::test::TestWindowDelegate delegate;

31 std::unique_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate(	31 std::unique_ptr<aura::Window> win1(CreateTestWindowInShellWithDelegate(

32 &delegate, 0, gfx::Rect(0, 0, 200, 200)));	32 &delegate, 0, gfx::Rect(0, 0, 200, 200)));

33	33

34 std::unique_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate(	34 std::unique_ptr<aura::Window> win2(CreateTestWindowInShellWithDelegate(

35 &delegate, 1, gfx::Rect(200, 200, 100, 100)));	35 &delegate, 1, gfx::Rect(200, 200, 100, 100)));

36	36

37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow());	37 ASSERT_NE(win1->GetRootWindow(), win2->GetRootWindow());

38	38

39 EXPECT_EQ(win1.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint(	39 EXPECT_EQ(win1.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint(

40 gfx::Point(50, 60)));	40 gfx::Point(50, 60)));

41 EXPECT_EQ(win2.get(), gfx::Screen::GetScreen()->GetWindowAtScreenPoint(	41 EXPECT_EQ(win2.get(), display::Screen::GetScreen()->GetWindowAtScreenPoint(

42 gfx::Point(250, 260)));	42 gfx::Point(250, 260)));

43 }	43 }

44	44

45 } // namespace ash	45 } // namespace ash

OLD	NEW