Index: content/plugin/plugin_thread.cc |
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc |
index 25732566e2c6a1e201b0f26f51240ff0359a54eb..0a6a1c514574a13b7aa848430194106cce5cf0d6 100644 |
--- a/content/plugin/plugin_thread.cc |
+++ b/content/plugin/plugin_thread.cc |
@@ -6,9 +6,7 @@ |
#include "build/build_config.h" |
-#if defined(TOOLKIT_GTK) |
-#include <gtk/gtk.h> |
-#elif defined(OS_MACOSX) |
+#if defined(OS_MACOSX) |
#include <CoreFoundation/CoreFoundation.h> |
#endif |
@@ -31,10 +29,6 @@ |
#include "third_party/WebKit/public/web/WebKit.h" |
#include "ipc/ipc_channel_handle.h" |
-#if defined(TOOLKIT_GTK) |
-#include "ui/gfx/gtk_util.h" |
-#endif |
- |
#if defined(USE_X11) |
#include "ui/base/x/x11_util.h" |
#endif |
@@ -83,31 +77,6 @@ PluginThread::PluginThread() |
switches::kPluginPath); |
lazy_tls.Pointer()->Set(this); |
-#if defined(TOOLKIT_GTK) |
- { |
- // XEmbed plugins assume they are hosted in a Gtk application, so we need |
- // to initialize Gtk in the plugin process. |
- // g_thread_init API is deprecated since glib 2.31.0, see release note: |
- // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.html |
-#if !(GLIB_CHECK_VERSION(2, 31, 0)) |
- g_thread_init(NULL); |
-#endif |
- |
- // Flash has problems receiving clicks with newer GTKs due to the |
- // client-side windows change. To be safe, we just always set the |
- // backwards-compat environment variable. |
- setenv("GDK_NATIVE_WINDOWS", "1", 1); |
- |
- gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); |
- |
- // GTK after 2.18 resets the environment variable. But if we're using |
- // nspluginwrapper, that means it'll spawn its subprocess without the |
- // environment variable! So set it again. |
- setenv("GDK_NATIVE_WINDOWS", "1", 1); |
- } |
- |
- ui::SetDefaultX11ErrorHandlers(); |
-#endif |
PatchNPNFunctions(); |