Index: chrome/browser/chromeos/login/webui_screen_locker.cc |
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.cc b/chrome/browser/chromeos/login/webui_screen_locker.cc |
index 4294eebde7ec2ff6f1ce5d192798880296cfb24d..a6798c7e1c246c550d6f49ddfbee7a4c7761e05c 100644 |
--- a/chrome/browser/chromeos/login/webui_screen_locker.cc |
+++ b/chrome/browser/chromeos/login/webui_screen_locker.cc |
@@ -4,15 +4,6 @@ |
#include "chrome/browser/chromeos/login/webui_screen_locker.h" |
-#include <X11/extensions/XTest.h> |
-#include <X11/keysym.h> |
-#include <gdk/gdkkeysyms.h> |
-#include <gdk/gdkx.h> |
- |
-// Evil hack to undo X11 evil #define. |
-#undef None |
-#undef Status |
- |
#include "base/command_line.h" |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
@@ -35,6 +26,12 @@ |
#include "ui/gfx/screen.h" |
#include "ui/views/widget/native_widget_gtk.h" |
+// These conflict with some of the Chrome headers, so must be included last. |
+#include <X11/extensions/XTest.h> |
+#include <X11/keysym.h> |
+#include <gdk/gdkkeysyms.h> |
+#include <gdk/gdkx.h> |
+ |
namespace { |
// URL which corresponds to the login WebUI. |