Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1895)

Unified Diff: chrome/browser/ui/gtk/dialogs_kde.cc

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: With this patchset, Chrome runs and exits normally on Linux. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8b6893e56ae2d25992faacce723793c518efdf3e..109b239e92c7c79c2486a73bf57059a4df883928 100644
--- a/chrome/browser/ui/gtk/dialogs_kde.cc
+++ b/chrome/browser/ui/gtk/dialogs_kde.cc
@@ -2,8 +2,7 @@
// 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"
#include <set>
@@ -22,6 +21,10 @@
#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;
namespace {

Powered by Google App Engine
This is Rietveld 408576698