OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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(USE_X11) | 9 #if defined(USE_X11) |
10 #include <gtk/gtk.h> | 10 #include <gtk/gtk.h> |
11 #elif defined(OS_MACOSX) | 11 #elif defined(OS_MACOSX) |
12 #include <CoreFoundation/CoreFoundation.h> | 12 #include <CoreFoundation/CoreFoundation.h> |
13 #endif | 13 #endif |
14 | 14 |
15 #include <string> | 15 #include <string> |
16 #include <vector> | 16 #include <vector> |
17 | 17 |
18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
19 #include "base/lazy_instance.h" | 19 #include "base/lazy_instance.h" |
20 #include "base/process_util.h" | 20 #include "base/process_util.h" |
21 #include "base/threading/thread_local.h" | 21 #include "base/threading/thread_local.h" |
22 #include "content/common/child_process.h" | 22 #include "content/common/child_process.h" |
23 #include "content/common/content_client.h" | |
24 #include "content/common/content_switches.h" | 23 #include "content/common/content_switches.h" |
25 #include "content/common/child_process_messages.h" | 24 #include "content/common/child_process_messages.h" |
26 #include "content/common/plugin_messages.h" | 25 #include "content/common/plugin_messages.h" |
| 26 #include "content/plugin/content_plugin_client.h" |
27 #include "content/plugin/npobject_util.h" | 27 #include "content/plugin/npobject_util.h" |
28 #include "ipc/ipc_channel_handle.h" | 28 #include "ipc/ipc_channel_handle.h" |
29 #include "net/base/net_errors.h" | 29 #include "net/base/net_errors.h" |
30 #include "webkit/glue/webkit_glue.h" | 30 #include "webkit/glue/webkit_glue.h" |
31 #include "webkit/plugins/npapi/plugin_lib.h" | 31 #include "webkit/plugins/npapi/plugin_lib.h" |
32 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" | 32 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
33 | 33 |
34 #if defined(TOOLKIT_USES_GTK) | 34 #if defined(TOOLKIT_USES_GTK) |
35 #include "ui/gfx/gtk_util.h" | 35 #include "ui/gfx/gtk_util.h" |
36 #endif | 36 #endif |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 PatchNPNFunctions(); | 74 PatchNPNFunctions(); |
75 | 75 |
76 // Preload the library to avoid loading, unloading then reloading | 76 // Preload the library to avoid loading, unloading then reloading |
77 preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_); | 77 preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_); |
78 | 78 |
79 scoped_refptr<webkit::npapi::PluginLib> plugin( | 79 scoped_refptr<webkit::npapi::PluginLib> plugin( |
80 webkit::npapi::PluginLib::CreatePluginLib(plugin_path_)); | 80 webkit::npapi::PluginLib::CreatePluginLib(plugin_path_)); |
81 if (plugin.get()) | 81 if (plugin.get()) |
82 plugin->NP_Initialize(); | 82 plugin->NP_Initialize(); |
83 | 83 |
84 content::GetContentClient()->PluginProcessStarted( | 84 content::GetContentClient()->plugin()->PluginProcessStarted( |
85 plugin.get() ? plugin->plugin_info().name : string16()); | 85 plugin.get() ? plugin->plugin_info().name : string16()); |
86 | 86 |
87 // Certain plugins, such as flash, steal the unhandled exception filter | 87 // Certain plugins, such as flash, steal the unhandled exception filter |
88 // thus we never get crash reports when they fault. This call fixes it. | 88 // thus we never get crash reports when they fault. This call fixes it. |
89 message_loop()->set_exception_restoration(true); | 89 message_loop()->set_exception_restoration(true); |
90 } | 90 } |
91 | 91 |
92 PluginThread::~PluginThread() { | 92 PluginThread::~PluginThread() { |
93 if (preloaded_plugin_module_) { | 93 if (preloaded_plugin_module_) { |
94 base::UnloadNativeLibrary(preloaded_plugin_module_); | 94 base::UnloadNativeLibrary(preloaded_plugin_module_); |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 bool result = ChildThread::current()->Send( | 184 bool result = ChildThread::current()->Send( |
185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); | 185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); |
186 if (!result || net_error != net::OK) | 186 if (!result || net_error != net::OK) |
187 return false; | 187 return false; |
188 | 188 |
189 *proxy_list = proxy_result; | 189 *proxy_list = proxy_result; |
190 return true; | 190 return true; |
191 } | 191 } |
192 | 192 |
193 } // namespace webkit_glue | 193 } // namespace webkit_glue |
OLD | NEW |