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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

Issue 294963004: Revert of Add OnDisplayMetricsChanged in DisplayObserver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@update_orientation
Patch Set: Created 6 years, 7 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 | « ui/views/widget/desktop_aura/desktop_screen_x11.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
index b892115d59c3cd1972ba856c803b093a71af7bcc..8a48ad13f95a6e7867d0de0c2b396a9ef6beaafa 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc
@@ -176,17 +176,16 @@
private:
// Overridden from gfx::DisplayObserver:
+ virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
+ changed_display_.push_back(display);
+ }
+
virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE {
added_display_.push_back(new_display);
}
virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE {
removed_display_.push_back(old_display);
- }
-
- virtual void OnDisplayMetricsChanged(const gfx::Display& display,
- uint32_t metrics) OVERRIDE {
- changed_display_.push_back(display);
}
scoped_ptr<DesktopScreenX11> screen_;
@@ -211,22 +210,22 @@
gfx::Rect(640, 0, 1024, 768)));
screen()->ProcessDisplayChange(displays);
+ EXPECT_EQ(0u, changed_display_.size());
+ EXPECT_EQ(1u, added_display_.size());
+ EXPECT_EQ(0u, removed_display_.size());
+}
+
+TEST_F(DesktopScreenX11Test, AddMonitorToTheLeft) {
+ std::vector<gfx::Display> displays;
+ displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 1024, 768)));
+ displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(1024, 0, 640, 480)));
+ screen()->ProcessDisplayChange(displays);
+
EXPECT_EQ(1u, changed_display_.size());
EXPECT_EQ(1u, added_display_.size());
EXPECT_EQ(0u, removed_display_.size());
}
-TEST_F(DesktopScreenX11Test, AddMonitorToTheLeft) {
- std::vector<gfx::Display> displays;
- displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 1024, 768)));
- displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(1024, 0, 640, 480)));
- screen()->ProcessDisplayChange(displays);
-
- EXPECT_EQ(1u, changed_display_.size());
- EXPECT_EQ(1u, added_display_.size());
- EXPECT_EQ(0u, removed_display_.size());
-}
-
TEST_F(DesktopScreenX11Test, RemoveMonitorOnRight) {
std::vector<gfx::Display> displays;
displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
@@ -240,7 +239,7 @@
displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(1u, changed_display_.size());
+ EXPECT_EQ(0u, changed_display_.size());
EXPECT_EQ(0u, added_display_.size());
EXPECT_EQ(1u, removed_display_.size());
}
@@ -456,97 +455,4 @@
widget->CloseNow();
}
-// Test that rotating the displays notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, RotationChange) {
- std::vector<gfx::Display> displays;
- displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
- displays.push_back(
- gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
- screen()->ProcessDisplayChange(displays);
- ResetDisplayChanges();
-
- displays[0].set_rotation(gfx::Display::ROTATE_90);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(1u, changed_display_.size());
-
- displays[1].set_rotation(gfx::Display::ROTATE_90);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[0].set_rotation(gfx::Display::ROTATE_270);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(3u, changed_display_.size());
-
- displays[0].set_rotation(gfx::Display::ROTATE_270);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(3u, changed_display_.size());
-
- displays[0].set_rotation(gfx::Display::ROTATE_0);
- displays[1].set_rotation(gfx::Display::ROTATE_0);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(5u, changed_display_.size());
-}
-
-// Test that changing the displays workarea notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, WorkareaChange) {
- std::vector<gfx::Display> displays;
- displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
- displays.push_back(
- gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
- screen()->ProcessDisplayChange(displays);
- ResetDisplayChanges();
-
- displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(1u, changed_display_.size());
-
- displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[0].set_work_area(gfx::Rect(0, 0, 640, 480));
- displays[1].set_work_area(gfx::Rect(640, 0, 1024, 768));
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(4u, changed_display_.size());
-}
-
-// Test that changing the device scale factor notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, DeviceScaleFactorChange) {
- std::vector<gfx::Display> displays;
- displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
- displays.push_back(
- gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
- screen()->ProcessDisplayChange(displays);
- ResetDisplayChanges();
-
- displays[0].set_device_scale_factor(2.5f);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(1u, changed_display_.size());
-
- displays[1].set_device_scale_factor(2.5f);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[0].set_device_scale_factor(2.5f);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[1].set_device_scale_factor(2.5f);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(2u, changed_display_.size());
-
- displays[0].set_device_scale_factor(1.f);
- displays[1].set_device_scale_factor(1.f);
- screen()->ProcessDisplayChange(displays);
- EXPECT_EQ(4u, changed_display_.size());
-}
-
} // namespace views
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_screen_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698