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

Unified Diff: ash/display/multi_display_manager_unittest.cc

Issue 10795080: A couple of multiple displays support fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 5 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/multi_display_manager.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager_unittest.cc
diff --git a/ash/display/multi_display_manager_unittest.cc b/ash/display/multi_display_manager_unittest.cc
index 2e9deaad38599960d60629e029c3994ab1a9c8a4..4b52fa231a7a32edefe04516081383c162da7633 100644
--- a/ash/display/multi_display_manager_unittest.cc
+++ b/ash/display/multi_display_manager_unittest.cc
@@ -108,9 +108,11 @@ TEST_F(MultiDisplayManagerTest, MAYBE_NativeDisplayTest) {
EXPECT_EQ(1U, display_manager()->GetNumDisplays());
// Update primary and add seconary.
- LOG(ERROR) << "A";
- UpdateDisplay("0+0-500x500,0+501-400x400");
+ UpdateDisplay("100+0-500x500,0+501-400x400");
EXPECT_EQ(2U, display_manager()->GetNumDisplays());
+ EXPECT_EQ("0,0 500x500",
+ display_manager()->GetDisplayAt(0)->bounds().ToString());
+
EXPECT_EQ("1 1 0", GetCountSummary());
EXPECT_EQ(display_manager()->GetDisplayAt(0)->id(), changed()[0].id());
EXPECT_EQ(display_manager()->GetDisplayAt(1)->id(), added()[0].id());
@@ -120,9 +122,8 @@ TEST_F(MultiDisplayManagerTest, MAYBE_NativeDisplayTest) {
EXPECT_EQ("0,501 400x400", added()[0].bounds_in_pixel().ToString());
reset();
- LOG(ERROR) << "B";
// Delete secondary.
- UpdateDisplay("0+0-500x500");
+ UpdateDisplay("100+0-500x500");
EXPECT_EQ("0 0 1", GetCountSummary());
reset();
« no previous file with comments | « ash/display/multi_display_manager.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698