| Index: ui/display/win/screen_win_unittest.cc
|
| diff --git a/ui/display/win/screen_win_unittest.cc b/ui/display/win/screen_win_unittest.cc
|
| index c59dd60d49019f166381f15e47fac749526d8929..db76be3ed6c7aaed8604b9ef79d967c31219f325 100644
|
| --- a/ui/display/win/screen_win_unittest.cc
|
| +++ b/ui/display/win/screen_win_unittest.cc
|
| @@ -344,6 +344,10 @@ TEST_F(ScreenWinTestSingleDisplay1x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestSingleDisplay1x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestSingleDisplay1x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(1u, displays.size());
|
| @@ -511,6 +515,10 @@ TEST_F(ScreenWinTestSingleDisplay1_25x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.25, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestSingleDisplay1_25x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.25, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestSingleDisplay1_25x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(1u, displays.size());
|
| @@ -667,6 +675,10 @@ TEST_F(ScreenWinTestSingleDisplay1_5x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.5, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestSingleDisplay1_5x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.5, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestSingleDisplay1_5x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(1u, displays.size());
|
| @@ -823,6 +835,10 @@ TEST_F(ScreenWinTestSingleDisplay2x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestSingleDisplay2x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestSingleDisplay2x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(1u, displays.size());
|
| @@ -1052,6 +1068,10 @@ TEST_F(ScreenWinTestTwoDisplays1x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays1x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays1x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
| @@ -1329,6 +1349,10 @@ TEST_F(ScreenWinTestTwoDisplays2x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays2x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays2x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
| @@ -1708,6 +1732,10 @@ TEST_F(ScreenWinTestManyDisplays1x, GetScaleFactorForHWND) {
|
| }
|
| }
|
|
|
| +TEST_F(ScreenWinTestManyDisplays1x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestManyDisplays1x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(5u, displays.size());
|
| @@ -2146,6 +2174,10 @@ TEST_F(ScreenWinTestManyDisplays2x, GetScaleFactorForHWND) {
|
| }
|
| }
|
|
|
| +TEST_F(ScreenWinTestManyDisplays2x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestManyDisplays2x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(5u, displays.size());
|
| @@ -2454,6 +2486,10 @@ TEST_F(ScreenWinTestTwoDisplays1x2x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays1x2x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays1x2x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
| @@ -2739,6 +2775,10 @@ TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(1.5, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays1_5x1x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
| @@ -3020,6 +3060,10 @@ TEST_F(ScreenWinTestTwoDisplays2x1x, GetScaleFactorForHWND) {
|
| EXPECT_EQ(1.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays2x1x, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays2x1x, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
| @@ -3306,6 +3350,10 @@ TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetScaleFactorForHWND) {
|
| EXPECT_EQ(2.0, ScreenWin::GetScaleFactorForHWND(GetRightFakeHwnd()));
|
| }
|
|
|
| +TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetLargestDeviceScaleFactor) {
|
| + EXPECT_EQ(2.0, ScreenWin::GetLargestDeviceScaleFactor());
|
| +}
|
| +
|
| TEST_F(ScreenWinTestTwoDisplays2x1xVirtualized, GetDisplays) {
|
| std::vector<Display> displays = GetScreen()->GetAllDisplays();
|
| ASSERT_EQ(2u, displays.size());
|
|
|