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

Unified Diff: ash/wm/toplevel_window_event_filter_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/wm/root_window_event_filter_unittest.cc ('k') | ui/aura/env.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/toplevel_window_event_filter_unittest.cc
diff --git a/ash/wm/toplevel_window_event_filter_unittest.cc b/ash/wm/toplevel_window_event_filter_unittest.cc
index 59cc595c1c8317fe1c95715ed65227eb339283c3..57cf3901afe8c55e750bd36bfe5508265a106830 100644
--- a/ash/wm/toplevel_window_event_filter_unittest.cc
+++ b/ash/wm/toplevel_window_event_filter_unittest.cc
@@ -434,7 +434,12 @@ TEST_F(ToplevelWindowEventFilterTest, DragSnaps) {
}
// Verifies pressing escape resets the bounds to the original bounds.
-TEST_F(ToplevelWindowEventFilterTest, EscapeReverts) {
+#if defined(OS_MACOSX)
+#define MAYBE_EscapeReverts FAILS_EscapeReverts
+#else
+#define MAYBE_EscapeReverts EscapeReverts
+#endif
+TEST_F(ToplevelWindowEventFilterTest, MAYBE_EscapeReverts) {
aura::RootWindow* root = Shell::GetRootWindow();
aura::client::ActivationClient* original_client =
aura::client::GetActivationClient(root);
« no previous file with comments | « ash/wm/root_window_event_filter_unittest.cc ('k') | ui/aura/env.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698