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

Unified Diff: ash/display/display_controller_unittest.cc

Issue 10828133: Desktop Aura: Allow tab drags out of window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 8 years, 4 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 | « no previous file | ash/display/multi_display_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller_unittest.cc
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc
index c6dee63d62944baf727471b0f32a2aa6852dc68a..055ca4b3e2bb2cb87411ab32c0b195cfce301f03 100644
--- a/ash/display/display_controller_unittest.cc
+++ b/ash/display/display_controller_unittest.cc
@@ -34,10 +34,8 @@ typedef test::AshTestBase DisplayControllerTest;
// TOD(oshima): Windows creates a window with smaller client area.
// Fix this and enable tests.
#define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout
-#define MAYBE_BoundsUpdated DISABLED_BoundsUpdated
#else
#define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
-#define MAYBE_BoundsUpdated BoundsUpdated
#endif
TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
@@ -74,7 +72,11 @@ TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString());
}
-TEST_F(DisplayControllerTest, MAYBE_BoundsUpdated) {
+// TODO(oshima,erg): I suspect this test is now failing because I've changed
+// the timing of the RootWindow::Show to be synchronous. If true, this test has
+// always been incorrect, but is now visibly broken now that we're processing
+// X11 configuration events while waiting for the MapNotify.
+TEST_F(DisplayControllerTest, DISABLED_BoundsUpdated) {
Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
internal::DisplayController::BOTTOM);
UpdateDisplay("500x500,400x400");
« no previous file with comments | « no previous file | ash/display/multi_display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698