content/plugin/plugin_thread.cc - Issue 7006006: Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or

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: content/plugin/plugin_thread.cc

Issue 7006006: Replace OS_LINUX ifdefs with OS_POSIX & !OS_MACOSX, TOOLKIT_USES_GTK, or (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 7 months 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: content/plugin/plugin_thread.cc

diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc

index eda6c92f7319b7cd99c0e94f0cfb18d3bd0a5539..18455d217d084bc4805c802432e22e4e959e7508 100644

--- a/content/plugin/plugin_thread.cc

+++ b/content/plugin/plugin_thread.cc

@@ -6,7 +6,7 @@

#include "build/build_config.h"

-#if defined(USE_X11)

+#if defined(TOOLKIT_USES_GTK)

#include <gtk/gtk.h>

#elif defined(OS_MACOSX)

#include <CoreFoundation/CoreFoundation.h>

@@ -49,7 +49,7 @@ PluginThread::PluginThread()

switches::kPluginPath);

lazy_tls.Pointer()->Set(this);

-#if defined(OS_LINUX)

+#if defined(TOOLKIT_USES_GTK)

{

// XEmbed plugins assume they are hosted in a Gtk application, so we need

// to initialize Gtk in the plugin process.

« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | content/ppapi_plugin/ppapi_webkitclient_impl.cc » ('j') | no next file with comments »