Chromium Code Reviews| 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 a810f3044d5c33180fad0cb99aef195522990c6c..f2add5ea772060df1db511203ea7dbc5e3bb71bd 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 { |