From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/display/screen_unittest.cc | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'chromium/ui/display/screen_unittest.cc') diff --git a/chromium/ui/display/screen_unittest.cc b/chromium/ui/display/screen_unittest.cc index 6acc48019ab..ac09e4e9f9a 100644 --- a/chromium/ui/display/screen_unittest.cc +++ b/chromium/ui/display/screen_unittest.cc @@ -6,6 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/display/display.h" +#include "ui/display/scoped_display_for_new_windows.h" #include "ui/display/test/test_screen.h" namespace display { @@ -16,6 +17,8 @@ const int DEFAULT_DISPLAY_ID = 0x1337; const int DEFAULT_DISPLAY_WIDTH = 2560; const int DEFAULT_DISPLAY_HEIGHT = 1440; +const int DISPLAY_2_ID = 0xc001; + } // namespace class ScreenTest : public testing::Test { @@ -28,6 +31,8 @@ class ScreenTest : public testing::Test { gfx::Rect(0, 0, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT)); test_screen_.display_list().RemoveDisplay(test_display.id()); test_screen_.display_list().AddDisplay(display, DisplayList::Type::PRIMARY); + test_screen_.display_list().AddDisplay(Display(DISPLAY_2_ID), + DisplayList::Type::NOT_PRIMARY); Screen::SetScreenInstance(&test_screen_); } @@ -46,7 +51,7 @@ TEST_F(ScreenTest, GetPrimaryDisplaySize) { } TEST_F(ScreenTest, GetNumDisplays) { - EXPECT_EQ(Screen::GetScreen()->GetNumDisplays(), 1); + EXPECT_EQ(Screen::GetScreen()->GetNumDisplays(), 2); } TEST_F(ScreenTest, GetDisplayWithDisplayId) { @@ -66,4 +71,20 @@ TEST_F(ScreenTest, GetDisplayForNewWindows) { screen->GetDisplayForNewWindows().id()); } +TEST_F(ScreenTest, ScopedDisplayForNewWindows) { + Screen* screen = Screen::GetScreen(); + + // Set primary as default; + screen->SetDisplayForNewWindows(DEFAULT_DISPLAY_ID); + EXPECT_EQ(DEFAULT_DISPLAY_ID, screen->GetDisplayForNewWindows().id()); + + // ScopedDisplayForNewWindows overrides while it is in scope. + { + ScopedDisplayForNewWindows scoped(DISPLAY_2_ID); + EXPECT_EQ(DISPLAY_2_ID, screen->GetDisplayForNewWindows().id()); + } + + EXPECT_EQ(DEFAULT_DISPLAY_ID, screen->GetDisplayForNewWindows().id()); +} + } // namespace display -- cgit v1.2.1