Index: chrome/browser/chromeos/input_method/xkeyboard.cc |
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc |
index e3379b2ba9fc5bf97ffd6c1a6dd03b9f370aa402..c69c211b047f288cc11cd36a5f41d2d485da8149 100644 |
--- a/chrome/browser/chromeos/input_method/xkeyboard.cc |
+++ b/chrome/browser/chromeos/input_method/xkeyboard.cc |
@@ -9,9 +9,6 @@ |
#include <string> |
#include <utility> |
-#include <X11/XKBlib.h> |
-#include <X11/Xlib.h> |
-#include <glib.h> |
#include <stdlib.h> |
#include <string.h> |
@@ -25,6 +22,11 @@ |
#include "content/public/browser/browser_thread.h" |
#include "ui/base/x/x11_util.h" |
+// These includes conflict with base/tracked_objects.h so must come last. |
+#include <X11/XKBlib.h> |
+#include <X11/Xlib.h> |
+#include <glib.h> |
+ |
using content::BrowserThread; |
namespace chromeos { |