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

Unified Diff: ash/wm/compact_layout_manager_unittest.cc

Issue 9585028: Mac Aura fails compile and some tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/system/brightness/tray_brightness.cc ('k') | ash/wm/root_window_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/compact_layout_manager_unittest.cc
diff --git a/ash/wm/compact_layout_manager_unittest.cc b/ash/wm/compact_layout_manager_unittest.cc
index 1e5506e1ebed68de78f5c59eb99473bf4ad4e9e3..55c8df6ec76dcd26020100834e3752ac3275e3b1 100644
--- a/ash/wm/compact_layout_manager_unittest.cc
+++ b/ash/wm/compact_layout_manager_unittest.cc
@@ -123,7 +123,12 @@ TEST_F(CompactLayoutManagerTest, StatusAreaVisibility) {
EXPECT_TRUE(widget->IsVisible());
}
-TEST_F(CompactLayoutManagerTest, TransitionTest) {
+#if defined(OS_MACOSX)
+#define MAYBE_TransitionTest FAILS_TransitionTest
+#else
+#define MAYBE_TransitionTest TransitionTest
+#endif
+TEST_F(CompactLayoutManagerTest, MAYBE_TransitionTest) {
// Assert on viewport size to be the host size.
ASSERT_EQ(kMaxWidth, default_container_layer_width());
// Create 3 windows, check that the layer grow as each one is added
« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | ash/wm/root_window_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698