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

Unified Diff: trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/ash/display/display_controller.cc ('k') | trunk/src/ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc
===================================================================
--- trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc (revision 269901)
+++ trunk/src/ash/drag_drop/drag_drop_interactive_uitest.cc (working copy)
@@ -142,7 +142,7 @@
}
};
-#if !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
#define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay
#else
#define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay
« no previous file with comments | « trunk/src/ash/display/display_controller.cc ('k') | trunk/src/ash/host/ash_window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698