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

Unified Diff: chrome/browser/browser_keyevents_browsertest.cc

Issue 136643006: Clean up some ifdefs around Win Aura. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 11 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
Index: chrome/browser/browser_keyevents_browsertest.cc
===================================================================
--- chrome/browser/browser_keyevents_browsertest.cc (revision 248569)
+++ chrome/browser/browser_keyevents_browsertest.cc (working copy)
@@ -395,9 +395,9 @@
#if defined(OS_WIN) || defined(OS_LINUX)
-#if defined(OS_LINUX) || (defined(OS_WIN) && defined(USE_AURA))
+#if defined(OS_LINUX) || defined(OS_WIN)
// Linux: http://crbug.com/129235
-// Win Aura: crbug.com/269564
+// Win: crbug.com/269564
#define MAYBE_CtrlKeyEvents DISABLED_CtrlKeyEvents
#else
#define MAYBE_CtrlKeyEvents CtrlKeyEvents
@@ -666,7 +666,7 @@
}
// Flaky, http://crbug.com/69475.
-#if defined(OS_LINUX) || (defined(OS_WIN) && defined(USE_AURA))
+#if defined(OS_LINUX) || defined(OS_WIN)
#define MAYBE_ReservedAccelerators DISABLED_ReservedAccelerators
#else
#define MAYBE_ReservedAccelerators ReservedAccelerators
« no previous file with comments | « chrome/browser/apps/web_view_interactive_browsertest.cc ('k') | chrome/browser/browser_process_platform_part.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698