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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/extensions/display_info_provider_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
index 67b4baacc81a852c8102fbc905f0b94b4d74e480..f9ee301e81aa886345e06109a591da05b8ef00a0 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -19,8 +19,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "extensions/common/api/system_display.h"
+#include "ui/display/display.h"
#include "ui/display/manager/display_layout.h"
-#include "ui/gfx/display.h"
#include "ui/gfx/geometry/rect.h"
namespace extensions {
@@ -50,9 +50,9 @@ class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
}
bool DisplayExists(int64_t display_id) const {
- const gfx::Display& display =
+ const display::Display& display =
GetDisplayManager()->GetDisplayForId(display_id);
- return display.id() != gfx::Display::kInvalidDisplayID;
+ return display.id() != display::Display::kInvalidDisplayID;
}
ash::DisplayManager* GetDisplayManager() const {
@@ -242,8 +242,9 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {
EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(90, result[0].rotation);
- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_270,
- gfx::Display::ROTATION_SOURCE_ACTIVE);
+ GetDisplayManager()->SetDisplayRotation(
+ display_id, display::Display::ROTATE_270,
+ display::Display::ROTATION_SOURCE_ACTIVE);
result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
@@ -253,8 +254,9 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {
EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(270, result[0].rotation);
- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_180,
- gfx::Display::ROTATION_SOURCE_ACTIVE);
+ GetDisplayManager()->SetDisplayRotation(
+ display_id, display::Display::ROTATE_180,
+ display::Display::ROTATION_SOURCE_ACTIVE);
result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
@@ -264,8 +266,9 @@ TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {
EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0].bounds));
EXPECT_EQ(180, result[0].rotation);
- GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_0,
- gfx::Display::ROTATION_SOURCE_ACTIVE);
+ GetDisplayManager()->SetDisplayRotation(
+ display_id, display::Display::ROTATE_0,
+ display::Display::ROTATION_SOURCE_ACTIVE);
result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
@@ -434,7 +437,7 @@ TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-520));
info.bounds_origin_y.reset(new int(50));
@@ -453,7 +456,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightExact) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1200));
info.bounds_origin_y.reset(new int(100));
@@ -472,7 +475,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightExact) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopExact) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1100));
info.bounds_origin_y.reset(new int(-400));
@@ -491,7 +494,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopExact) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginBottomExact) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-350));
info.bounds_origin_y.reset(new int(600));
@@ -510,7 +513,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginBottomExact) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSameCenter) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(340));
info.bounds_origin_y.reset(new int(100));
@@ -529,7 +532,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSameCenter) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftOutside) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-1040));
info.bounds_origin_y.reset(new int(100));
@@ -548,7 +551,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftOutside) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopOutside) {
UpdateDisplay("1200x600,520x400");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-360));
info.bounds_origin_y.reset(new int(-301));
@@ -568,7 +571,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
SetBoundsOriginLeftButSharesBottomSide) {
UpdateDisplay("1200x600,1000x100");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-650));
info.bounds_origin_y.reset(new int(700));
@@ -587,7 +590,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightButSharesTopSide) {
UpdateDisplay("1200x600,1000x100");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(850));
info.bounds_origin_y.reset(new int(-150));
@@ -606,7 +609,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightButSharesTopSide) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopButSharesLeftSide) {
UpdateDisplay("1200x600,1000x100/l");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(-150));
info.bounds_origin_y.reset(new int(-650));
@@ -626,7 +629,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
SetBoundsOriginBottomButSharesRightSide) {
UpdateDisplay("1200x600,1000x100/l");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(1350));
info.bounds_origin_y.reset(new int(450));
@@ -645,7 +648,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginPrimaryHiDPI) {
UpdateDisplay("1200x600*2,500x500");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(250));
info.bounds_origin_y.reset(new int(-100));
@@ -664,7 +667,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginPrimaryHiDPI) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSecondaryHiDPI) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(450));
info.bounds_origin_y.reset(new int(-100));
@@ -683,7 +686,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSecondaryHiDPI) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBounds) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(0x200001));
info.bounds_origin_y.reset(new int(-100));
@@ -702,7 +705,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBounds) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBoundsNegative) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.bounds_origin_y.reset(new int(-0x200001));
@@ -721,7 +724,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBoundsNegative) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginMaxValues) {
UpdateDisplay("1200x4600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(200000));
info.bounds_origin_y.reset(new int(10));
@@ -740,7 +743,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginMaxValues) {
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
info.is_primary.reset(new bool(true));
@@ -756,14 +759,16 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {
EXPECT_EQ("1200,0 300x500", secondary.bounds().ToString());
// The operation failed because the primary property would be set before
// setting bounds. The primary display shouldn't have been changed, though.
- EXPECT_NE(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+ EXPECT_NE(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+ secondary.id());
}
TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
- const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& primary =
+ display::Screen::GetScreen()->GetPrimaryDisplay();
api::system_display::DisplayProperties info;
info.bounds_origin_x.reset(new int(300));
@@ -783,7 +788,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.rotation.reset(new int(90));
@@ -796,7 +801,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
EXPECT_TRUE(error.empty());
EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString());
- EXPECT_EQ(gfx::Display::ROTATE_90, secondary.rotation());
+ EXPECT_EQ(display::Display::ROTATE_90, secondary.rotation());
info.rotation.reset(new int(270));
CallSetDisplayUnitInfo(
@@ -806,7 +811,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
EXPECT_TRUE(error.empty());
EXPECT_EQ("1200,0 500x300", secondary.bounds().ToString());
- EXPECT_EQ(gfx::Display::ROTATE_270, secondary.rotation());
+ EXPECT_EQ(display::Display::ROTATE_270, secondary.rotation());
info.rotation.reset(new int(180));
// Switch primary display.
@@ -818,8 +823,9 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
EXPECT_TRUE(error.empty());
EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
- EXPECT_EQ(gfx::Display::ROTATE_180, secondary.rotation());
- EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+ EXPECT_EQ(display::Display::ROTATE_180, secondary.rotation());
+ EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+ secondary.id());
info.rotation.reset(new int(0));
CallSetDisplayUnitInfo(
@@ -829,8 +835,9 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
EXPECT_TRUE(error.empty());
EXPECT_EQ("0,0 300x500", secondary.bounds().ToString());
- EXPECT_EQ(gfx::Display::ROTATE_0, secondary.rotation());
- EXPECT_EQ(gfx::Screen::GetScreen()->GetPrimaryDisplay().id(), secondary.id());
+ EXPECT_EQ(display::Display::ROTATE_0, secondary.rotation());
+ EXPECT_EQ(display::Screen::GetScreen()->GetPrimaryDisplay().id(),
+ secondary.id());
}
// Tests that rotation changes made before entering maximize mode are restored
@@ -843,8 +850,9 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
bool success = false;
std::string error;
- CallSetDisplayUnitInfo(base::Int64ToString(gfx::Display::InternalDisplayId()),
- info, &success, &error);
+ CallSetDisplayUnitInfo(
+ base::Int64ToString(display::Display::InternalDisplayId()), info,
+ &success, &error);
ASSERT_TRUE(success);
EXPECT_TRUE(error.empty());
@@ -860,14 +868,14 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationBeforeMaximizeMode) {
// ScreenOrientationController rotations override display info.
screen_orientation_controller->SetDisplayRotation(
- gfx::Display::ROTATE_0, gfx::Display::ROTATION_SOURCE_ACTIVE);
- EXPECT_EQ(gfx::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
+ display::Display::ROTATE_0, display::Display::ROTATION_SOURCE_ACTIVE);
+ EXPECT_EQ(display::Display::ROTATE_0, GetCurrentInternalDisplayRotation());
// Exiting maximize mode should restore the initial rotation
ash::Shell::GetInstance()
->maximize_mode_controller()
->EnableMaximizeModeWindowManager(false);
- EXPECT_EQ(gfx::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
+ EXPECT_EQ(display::Display::ROTATE_90, GetCurrentInternalDisplayRotation());
}
// Tests that rotation changes made during maximize mode lock the display
@@ -887,8 +895,9 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
bool success = false;
std::string error;
- CallSetDisplayUnitInfo(base::Int64ToString(gfx::Display::InternalDisplayId()),
- info, &success, &error);
+ CallSetDisplayUnitInfo(
+ base::Int64ToString(display::Display::InternalDisplayId()), info,
+ &success, &error);
ASSERT_TRUE(success);
EXPECT_TRUE(error.empty());
@@ -900,7 +909,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotationDuringMaximizeMode) {
TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.rotation.reset(new int(91));
@@ -916,7 +925,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.overscan.reset(new api::system_display::Insets);
info.overscan->left = -10;
@@ -979,7 +988,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanHorizontalBounds) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.overscan.reset(new api::system_display::Insets);
// Horizontal overscan is 151, which would make the bounds width 149.
@@ -1001,7 +1010,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanHorizontalBounds) {
TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
UpdateDisplay("1200x600,600x1000");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.overscan.reset(new api::system_display::Insets);
// Vertical overscan is 501, which would make the bounds height 499.
@@ -1022,7 +1031,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
TEST_F(DisplayInfoProviderChromeosTest, SetOverscan) {
UpdateDisplay("1200x600,600x1000*2");
- const gfx::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
+ const display::Display& secondary = ash::ScreenUtil::GetSecondaryDisplay();
api::system_display::DisplayProperties info;
info.overscan.reset(new api::system_display::Insets);
info.overscan->left = 20;
« no previous file with comments | « chrome/browser/extensions/display_info_provider_chromeos.cc ('k') | chrome/browser/extensions/display_info_provider_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698