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

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

Issue 2361283002: Add GetDisplayWithDisplayId to display::Screen. (Closed)
Patch Set: test Created 4 years, 2 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 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 24 matching lines...) Expand all
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(), display::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(), display::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 TEST_F(ScreenAshTest, TestGetDisplayById) {
46 if (!SupportsMultipleDisplays())
47 return;
48
49 UpdateDisplay("200x200,400x400");
50 int64_t id = SetFirstDisplayAsInternalDisplay();
51 display::Display display;
52 bool has_display =
53 display::Screen::GetScreen()->GetDisplayWithDisplayId(id, &display);
54 EXPECT_TRUE(has_display);
55 EXPECT_EQ(id, display.id());
56 }
57
45 } // namespace ash 58 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698