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

Unified Diff: chrome/browser/chromeos/system_key_event_listener_browsertest.cc

Issue 8762015: cleanup: Fix #include order. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/system_key_event_listener_browsertest.cc
diff --git a/chrome/browser/chromeos/system_key_event_listener_browsertest.cc b/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
index 6bc07d760900ba26bdb95a066b521421828ba524..40c7551efb6a18d13c93bcd87e8b5cf59d69bd95 100644
--- a/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
+++ b/chrome/browser/chromeos/system_key_event_listener_browsertest.cc
@@ -3,6 +3,10 @@
// found in the LICENSE file.
#include <X11/keysym.h>
+#include <X11/Xlib.h>
+#undef Bool
+#undef None
+#undef Status
#include <cstring>
@@ -15,8 +19,6 @@
#include "chrome/test/base/ui_test_utils.h"
#include "ui/base/x/x11_util.h"
-#include <X11/Xlib.h> // should be here since it #defines lots of macros.
-
#if defined(USE_VIRTUAL_KEYBOARD)
// Since USE_VIRTUAL_KEYBOARD build only supports a few keyboard layouts, we
// skip the tests for now.
@@ -166,7 +168,7 @@ class SystemKeyEventListenerTest : public InProcessBrowserTest {
key_event->same_screen = True;
key_event->send_event = False;
key_event->state = modifiers;
- key_event->subwindow = None;
+ key_event->subwindow = 0L; // None
key_event->time = CurrentTime;
key_event->type = is_press ? KeyPress : KeyRelease;
key_event->window = focused;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698