| 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_GTK) | 9 #if defined(TOOLKIT_GTK) |
| 10 #include <gtk/gtk.h> | 10 #include <gtk/gtk.h> |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 LAZY_INSTANCE_INITIALIZER; | 74 LAZY_INSTANCE_INITIALIZER; |
| 75 | 75 |
| 76 PluginThread::PluginThread() | 76 PluginThread::PluginThread() |
| 77 : preloaded_plugin_module_(NULL), | 77 : preloaded_plugin_module_(NULL), |
| 78 forcefully_terminate_plugin_process_(false) { | 78 forcefully_terminate_plugin_process_(false) { |
| 79 base::FilePath plugin_path = | 79 base::FilePath plugin_path = |
| 80 CommandLine::ForCurrentProcess()->GetSwitchValuePath( | 80 CommandLine::ForCurrentProcess()->GetSwitchValuePath( |
| 81 switches::kPluginPath); | 81 switches::kPluginPath); |
| 82 | 82 |
| 83 lazy_tls.Pointer()->Set(this); | 83 lazy_tls.Pointer()->Set(this); |
| 84 #if defined(USE_AURA) | 84 #if defined(TOOLKIT_GTK) |
| 85 // TODO(saintlou): | |
| 86 #elif defined(TOOLKIT_GTK) | |
| 87 { | 85 { |
| 88 // XEmbed plugins assume they are hosted in a Gtk application, so we need | 86 // XEmbed plugins assume they are hosted in a Gtk application, so we need |
| 89 // to initialize Gtk in the plugin process. | 87 // to initialize Gtk in the plugin process. |
| 90 // g_thread_init API is deprecated since glib 2.31.0, see release note: | 88 // g_thread_init API is deprecated since glib 2.31.0, see release note: |
| 91 // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.
html | 89 // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.
html |
| 92 #if !(GLIB_CHECK_VERSION(2, 31, 0)) | 90 #if !(GLIB_CHECK_VERSION(2, 31, 0)) |
| 93 g_thread_init(NULL); | 91 g_thread_init(NULL); |
| 94 #endif | 92 #endif |
| 95 | 93 |
| 96 // Flash has problems receiving clicks with newer GTKs due to the | 94 // Flash has problems receiving clicks with newer GTKs due to the |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 } | 180 } |
| 183 | 181 |
| 184 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); | 182 Send(new PluginProcessHostMsg_ChannelCreated(channel_handle)); |
| 185 } | 183 } |
| 186 | 184 |
| 187 void PluginThread::OnNotifyRenderersOfPendingShutdown() { | 185 void PluginThread::OnNotifyRenderersOfPendingShutdown() { |
| 188 PluginChannel::NotifyRenderersOfPendingShutdown(); | 186 PluginChannel::NotifyRenderersOfPendingShutdown(); |
| 189 } | 187 } |
| 190 | 188 |
| 191 } // namespace content | 189 } // namespace content |
| OLD | NEW |