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

Unified Diff: chrome/browser/extensions/extension_commands_global_registry_apitest.cc

Issue 372743004: ozone: Fix interactive_ui_tests build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/extensions/extension_commands_global_registry_apitest.cc
diff --git a/chrome/browser/extensions/extension_commands_global_registry_apitest.cc b/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
index 10c4f32cb50e477573bddf0576b197ff3e825262..d48e2a3890643e91ddb12fd99d78d7cfd45af03f 100644
--- a/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
+++ b/chrome/browser/extensions/extension_commands_global_registry_apitest.cc
@@ -30,7 +30,7 @@ namespace extensions {
typedef ExtensionApiTest GlobalCommandsApiTest;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && defined(USE_X11)
sky 2014/07/09 20:17:49 Do we need the OS_LINUX conditions in the ifdefs h
// Send a simulated key press and release event, where |control|, |shift| or
// |alt| indicates whether the key is struck with corresponding modifier.
void SendNativeKeyEventToXDisplay(ui::KeyboardCode key,
@@ -71,7 +71,7 @@ void SendNativeKeyEventToXDisplay(ui::KeyboardCode key,
XFlush(display);
}
-#endif // OS_LINUX
+#endif // OS_LINUX && USE_X11
#if defined(OS_MACOSX)
using base::ScopedCFTypeRef;
@@ -152,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(GlobalCommandsApiTest, MAYBE_GlobalCommand) {
// Activate the shortcut (Ctrl+Shift+9). This should have an effect.
ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
incognito_browser, ui::VKEY_9, true, true, false, false));
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) && defined(USE_X11)
// Create an incognito browser to capture the focus.
CreateIncognitoBrowser();

Powered by Google App Engine
This is Rietveld 408576698