| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/plugin/plugin_thread.h" | 5 #include "content/plugin/plugin_thread.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 | 8 |
| 9 #if defined(TOOLKIT_USES_GTK) | 9 #if defined(TOOLKIT_USES_GTK) |
| 10 #include <gtk/gtk.h> | 10 #include <gtk/gtk.h> |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 PluginThread::PluginThread() | 73 PluginThread::PluginThread() |
| 74 : preloaded_plugin_module_(NULL) { | 74 : preloaded_plugin_module_(NULL) { |
| 75 FilePath plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath( | 75 FilePath plugin_path = CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
| 76 switches::kPluginPath); | 76 switches::kPluginPath); |
| 77 | 77 |
| 78 lazy_tls.Pointer()->Set(this); | 78 lazy_tls.Pointer()->Set(this); |
| 79 #if defined(USE_AURA) | 79 #if defined(USE_AURA) |
| 80 // TODO(saintlou): | 80 // TODO(saintlou): |
| 81 #elif defined(TOOLKIT_USES_GTK) | 81 #elif defined(TOOLKIT_USES_GTK) |
| 82 { | 82 { |
| 83 // g_thread_init is deprecated since gtk version 2.32 |
| 84 #if GTK_VERSION_MAJOR == 2 && GTK_VERSION_MINOR < 32 |
| 83 // XEmbed plugins assume they are hosted in a Gtk application, so we need | 85 // XEmbed plugins assume they are hosted in a Gtk application, so we need |
| 84 // to initialize Gtk in the plugin process. | 86 // to initialize Gtk in the plugin process. |
| 85 g_thread_init(NULL); | 87 g_thread_init(NULL); |
| 86 | 88 #endif |
| 87 // Flash has problems receiving clicks with newer GTKs due to the | 89 // Flash has problems receiving clicks with newer GTKs due to the |
| 88 // client-side windows change. To be safe, we just always set the | 90 // client-side windows change. To be safe, we just always set the |
| 89 // backwards-compat environment variable. | 91 // backwards-compat environment variable. |
| 90 setenv("GDK_NATIVE_WINDOWS", "1", 1); | 92 setenv("GDK_NATIVE_WINDOWS", "1", 1); |
| 91 | 93 |
| 92 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); | 94 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); |
| 93 | 95 |
| 94 // GTK after 2.18 resets the environment variable. But if we're using | 96 // GTK after 2.18 resets the environment variable. But if we're using |
| 95 // nspluginwrapper, that means it'll spawn its subprocess without the | 97 // nspluginwrapper, that means it'll spawn its subprocess without the |
| 96 // environment variable! So set it again. | 98 // environment variable! So set it again. |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 #endif | 171 #endif |
| 170 channel->set_incognito(incognito); | 172 channel->set_incognito(incognito); |
| 171 } | 173 } |
| 172 | 174 |
| 173 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); | 175 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); |
| 174 } | 176 } |
| 175 | 177 |
| 176 void PluginThread::OnNotifyRenderersOfPendingShutdown() { | 178 void PluginThread::OnNotifyRenderersOfPendingShutdown() { |
| 177 PluginChannel::NotifyRenderersOfPendingShutdown(); | 179 PluginChannel::NotifyRenderersOfPendingShutdown(); |
| 178 } | 180 } |
| OLD | NEW |