diff options
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_util.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_util.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index b00c062..7c1c9e36 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -5,10 +5,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include <cairo/cairo.h> -#include <gdk/gdkx.h> -#include <gtk/gtk.h> #include <cstdarg> + #include <map> #include "base/environment.h" @@ -53,6 +52,10 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #endif +// These conflict with base/tracked_objects.h, so need to come last. +#include <gdk/gdkx.h> +#include <gtk/gtk.h> + namespace { #if defined(GOOGLE_CHROME_BUILD) |