Index: chrome/browser/ui/gtk/dialogs_kde.cc |
diff --git a/chrome/browser/ui/gtk/dialogs_kde.cc b/chrome/browser/ui/gtk/dialogs_kde.cc |
index 5cb98decb458bc9a6e3200ceddf080c3fc60640e..0627fe4ca98c1422d353a70a879dd851581ab4a2 100644 |
--- a/chrome/browser/ui/gtk/dialogs_kde.cc |
+++ b/chrome/browser/ui/gtk/dialogs_kde.cc |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include <gdk/gdkx.h> |
-#include <gtk/gtk.h> |
+#include "content/public/browser/browser_thread.h" |
jam
2011/11/07 21:43:24
can we sort this now that you added the gtk header
Jói
2011/11/18 23:21:44
This is no longer part of the change.
|
+ |
#include <map> |
#include <set> |
@@ -23,10 +23,13 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/ui/gtk/dialogs_common.h" |
#include "chrome/browser/ui/shell_dialogs.h" |
-#include "content/public/browser/browser_thread.h" |
#include "grit/generated_resources.h" |
#include "ui/base/l10n/l10n_util.h" |
+// These conflict with base/tracked_objects.h, so need to come last. |
+#include <gdk/gdkx.h> |
+#include <gtk/gtk.h> |
+ |
using content::BrowserThread; |
// Implementation of SelectFileDialog that shows a KDE common dialog for |