Chromium Code Reviews| Index: chrome/browser/ui/gtk/gtk_util.cc |
| diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc |
| index b00c0628ea410f1f2ed2a0e07a5e24e58bf53aba..7c1c9e362e886e6a37bbc251c22ee1a79ce0c66a 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) |