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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8718012: Revert 111695 - Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/browser/ui/browser_list.cc ('k') | chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/gtk_util.cc
===================================================================
--- chrome/browser/ui/gtk/gtk_util.cc (revision 111697)
+++ chrome/browser/ui/gtk/gtk_util.cc (working copy)
@@ -5,9 +5,10 @@
#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"
@@ -52,10 +53,6 @@
#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)
Property changes on: chrome/browser/ui/gtk/gtk_util.cc
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « chrome/browser/ui/browser_list.cc ('k') | chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698