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 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 5 #ifndef CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 6 #define CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "base/process.h" | 14 #include "base/process.h" |
15 #include "base/scoped_native_library.h" | 15 #include "base/scoped_native_library.h" |
16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
17 #include "content/common/child_thread.h" | 17 #include "content/common/child_thread.h" |
| 18 #include "content/public/plugin/content_plugin_client.h" |
18 #include "ipc/ipc_listener.h" | 19 #include "ipc/ipc_listener.h" |
19 #include "ppapi/c/pp_module.h" | 20 #include "ppapi/c/pp_module.h" |
20 #include "ppapi/c/trusted/ppp_broker.h" | 21 #include "ppapi/c/trusted/ppp_broker.h" |
21 #include "ppapi/proxy/plugin_dispatcher.h" | 22 #include "ppapi/proxy/plugin_dispatcher.h" |
22 #include "ppapi/proxy/plugin_globals.h" | 23 #include "ppapi/proxy/plugin_globals.h" |
23 #include "ppapi/proxy/plugin_proxy_delegate.h" | 24 #include "ppapi/proxy/plugin_proxy_delegate.h" |
24 #include "webkit/plugins/ppapi/plugin_module.h" | 25 #include "webkit/plugins/ppapi/plugin_module.h" |
25 | 26 |
26 #if defined(OS_WIN) | 27 #if defined(OS_WIN) |
27 #include "base/win/scoped_handle.h" | 28 #include "base/win/scoped_handle.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 // Sets up the channel to the given renderer. On success, returns true and | 107 // Sets up the channel to the given renderer. On success, returns true and |
107 // fills the given ChannelHandle with the information from the new channel. | 108 // fills the given ChannelHandle with the information from the new channel. |
108 bool SetupRendererChannel(base::ProcessId renderer_pid, | 109 bool SetupRendererChannel(base::ProcessId renderer_pid, |
109 int renderer_child_id, | 110 int renderer_child_id, |
110 bool incognito, | 111 bool incognito, |
111 IPC::ChannelHandle* handle); | 112 IPC::ChannelHandle* handle); |
112 | 113 |
113 // Sets up the name of the plugin for logging using the given path. | 114 // Sets up the name of the plugin for logging using the given path. |
114 void SavePluginName(const base::FilePath& path); | 115 void SavePluginName(const base::FilePath& path); |
115 | 116 |
| 117 void ReportLoadResult(const base::FilePath& path, |
| 118 ContentPluginClient::PluginLoadResult result); |
| 119 |
116 // True if running in a broker process rather than a normal plugin process. | 120 // True if running in a broker process rather than a normal plugin process. |
117 bool is_broker_; | 121 bool is_broker_; |
118 | 122 |
119 base::ScopedNativeLibrary library_; | 123 base::ScopedNativeLibrary library_; |
120 | 124 |
121 ppapi::PpapiPermissions permissions_; | 125 ppapi::PpapiPermissions permissions_; |
122 | 126 |
123 // Global state tracking for the proxy. | 127 // Global state tracking for the proxy. |
124 ppapi::proxy::PluginGlobals plugin_globals_; | 128 ppapi::proxy::PluginGlobals plugin_globals_; |
125 | 129 |
(...skipping 28 matching lines...) Expand all Loading... |
154 #endif | 158 #endif |
155 | 159 |
156 DispatcherMessageListener dispatcher_message_listener_; | 160 DispatcherMessageListener dispatcher_message_listener_; |
157 | 161 |
158 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); | 162 DISALLOW_IMPLICIT_CONSTRUCTORS(PpapiThread); |
159 }; | 163 }; |
160 | 164 |
161 } // namespace content | 165 } // namespace content |
162 | 166 |
163 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ | 167 #endif // CONTENT_PPAPI_PLUGIN_PPAPI_THREAD_H_ |
OLD | NEW |