chrome/browser/ui/gtk/gtk_util.cc - Issue 8477004: Have content/ create and destroy its own threads.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 8477004: Have content/ create and destroy its own threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix official build, avoid DCHECK in official Linux/ChromeOS builds. 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:

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)