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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_controller_unittest.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | ash/keyboard_overlay/keyboard_overlay_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index 3ccca26061209431cd4d4c18bfdfd2476e1e9142..6026de2db9f8a021ab480fb97c2f90b0b3e10867 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -47,12 +47,12 @@ class TestObserver : public DisplayController::Observer {
};
gfx::Display GetPrimaryDisplay() {
- return gfx::Screen::GetDisplayNearestWindow(
+ return Shell::GetAshScreen()->GetDisplayNearestWindow(
Shell::GetAllRootWindows()[0]);
}
gfx::Display GetSecondaryDisplay() {
- return gfx::Screen::GetDisplayNearestWindow(
+ return Shell::GetAshScreen()->GetDisplayNearestWindow(
Shell::GetAllRootWindows()[1]);
}
@@ -146,11 +146,11 @@ TEST_F(DisplayControllerTest, MAYBE_BoundsUpdated) {
UpdateDisplay("400x400");
EXPECT_EQ(1, observer.CountAndReset());
EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
- EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
+ EXPECT_EQ(1, Shell::GetAshScreen()->GetNumDisplays());
UpdateDisplay("500x500,700x700");
EXPECT_EQ(2, observer.CountAndReset());
- ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
+ ASSERT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
EXPECT_EQ("0,500 700x700", GetSecondaryDisplay().bounds().ToString());
}
@@ -190,7 +190,7 @@ TEST_F(DisplayControllerTest, SwapPrimary) {
Shell::GetInstance()->display_controller();
UpdateDisplay("200x200,300x300");
- gfx::Display primary_display = gfx::Screen::GetPrimaryDisplay();
+ gfx::Display primary_display = Shell::GetAshScreen()->GetPrimaryDisplay();
gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
std::string secondary_name = aura::Env::GetInstance()->
@@ -209,18 +209,21 @@ TEST_F(DisplayControllerTest, SwapPrimary) {
EXPECT_TRUE(primary_root->Contains(launcher_window));
EXPECT_FALSE(secondary_root->Contains(launcher_window));
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point(-100, -100)).id());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestWindow(NULL).id());
+ Shell::GetAshScreen()->GetDisplayNearestWindow(NULL).id());
// Switch primary and secondary
display_controller->SetPrimaryDisplay(secondary_display);
- EXPECT_EQ(secondary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(secondary_display.id(),
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
EXPECT_EQ(secondary_display.id(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point(-100, -100)).id());
EXPECT_EQ(secondary_display.id(),
- gfx::Screen::GetDisplayNearestWindow(NULL).id());
+ Shell::GetAshScreen()->GetDisplayNearestWindow(NULL).id());
EXPECT_EQ(
primary_root,
@@ -243,12 +246,14 @@ TEST_F(DisplayControllerTest, SwapPrimary) {
// Deleting 2nd display should move the primary to original primary display.
UpdateDisplay("200x200");
RunAllPendingInMessageLoop(); // RootWindow is deleted in a posted task.
- EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
- EXPECT_EQ(primary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(1, Shell::GetAshScreen()->GetNumDisplays());
+ EXPECT_EQ(primary_display.id(),
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point(-100, -100)).id());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestWindow(NULL).id());
+ Shell::GetAshScreen()->GetDisplayNearestWindow(NULL).id());
EXPECT_TRUE(tracker.Contains(primary_root));
EXPECT_FALSE(tracker.Contains(secondary_root));
EXPECT_TRUE(primary_root->Contains(launcher_window));
@@ -259,7 +264,7 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
Shell::GetInstance()->display_controller();
UpdateDisplay("200x200,300x300");
- gfx::Display primary_display = gfx::Screen::GetPrimaryDisplay();
+ gfx::Display primary_display = Shell::GetAshScreen()->GetPrimaryDisplay();
gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
std::string secondary_name = aura::Env::GetInstance()->
@@ -278,14 +283,16 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
EXPECT_FALSE(secondary_root->Contains(launcher_window));
EXPECT_NE(primary_root, secondary_root);
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point(-100, -100)).id());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestWindow(NULL).id());
+ Shell::GetAshScreen()->GetDisplayNearestWindow(NULL).id());
// Switch primary and secondary by display ID.
TestObserver observer;
display_controller->SetPrimaryDisplayId(secondary_display.id());
- EXPECT_EQ(secondary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(secondary_display.id(),
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
EXPECT_LT(0, observer.CountAndReset());
@@ -314,12 +321,14 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
// Deleting 2nd display should move the primary to original primary display.
UpdateDisplay("200x200");
RunAllPendingInMessageLoop(); // RootWindow is deleted in a posted task.
- EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
- EXPECT_EQ(primary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(1, Shell::GetAshScreen()->GetNumDisplays());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point(-100, -100)).id());
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(primary_display.id(),
- gfx::Screen::GetDisplayNearestWindow(NULL).id());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point(-100, -100)).id());
+ EXPECT_EQ(primary_display.id(),
+ Shell::GetAshScreen()->GetDisplayNearestWindow(NULL).id());
EXPECT_TRUE(tracker.Contains(primary_root));
EXPECT_FALSE(tracker.Contains(secondary_root));
EXPECT_TRUE(primary_root->Contains(launcher_window));
@@ -333,8 +342,9 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
aura::Env::GetInstance()->display_manager();
display_manager->OnNativeDisplaysChanged(displays);
- EXPECT_EQ(2, gfx::Screen::GetNumDisplays());
- EXPECT_EQ(secondary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
+ EXPECT_EQ(secondary_display.id(),
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(primary_display.id(), ScreenAsh::GetSecondaryDisplay().id());
EXPECT_EQ(
primary_root,
@@ -354,8 +364,9 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
displays2.push_back(primary_display);
displays2.push_back(third_display);
display_manager->OnNativeDisplaysChanged(displays2);
- EXPECT_EQ(2, gfx::Screen::GetNumDisplays());
- EXPECT_EQ(primary_display.id(), gfx::Screen::GetPrimaryDisplay().id());
+ EXPECT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
+ EXPECT_EQ(primary_display.id(),
+ Shell::GetAshScreen()->GetPrimaryDisplay().id());
EXPECT_EQ(third_display.id(), ScreenAsh::GetSecondaryDisplay().id());
EXPECT_EQ(
primary_root,
@@ -368,7 +379,7 @@ TEST_F(DisplayControllerTest, SwapPrimaryById) {
TEST_F(DisplayControllerTest, MAYBE_UpdateDisplayWithHostOrigin) {
UpdateDisplay("100x200,300x400");
- ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
+ ASSERT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
Shell::RootWindowList root_windows =
Shell::GetInstance()->GetAllRootWindows();
ASSERT_EQ(2U, root_windows.size());
@@ -379,21 +390,21 @@ TEST_F(DisplayControllerTest, MAYBE_UpdateDisplayWithHostOrigin) {
EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString());
UpdateDisplay("100x200,200+300-300x400");
- ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
+ ASSERT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
EXPECT_EQ("0,0", root_windows[0]->GetHostOrigin().ToString());
EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
EXPECT_EQ("200,300", root_windows[1]->GetHostOrigin().ToString());
EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString());
UpdateDisplay("400+500-200x300,300x400");
- ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
+ ASSERT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
EXPECT_EQ("400,500", root_windows[0]->GetHostOrigin().ToString());
EXPECT_EQ("200x300", root_windows[0]->GetHostSize().ToString());
EXPECT_EQ("0,0", root_windows[1]->GetHostOrigin().ToString());
EXPECT_EQ("300x400", root_windows[1]->GetHostSize().ToString());
UpdateDisplay("100+200-100x200,300+500-200x300");
- ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
+ ASSERT_EQ(2, Shell::GetAshScreen()->GetNumDisplays());
EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/mouse_cursor_event_filter.cc » ('j') | ash/keyboard_overlay/keyboard_overlay_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698