| Index: content/browser/plugin_service_impl.h
|
| diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
|
| index 9c4d5018432fcab001ec6c2f146462fb25e17de7..0a76324ee157582409e446cdcfd435fdede14f5d 100644
|
| --- a/content/browser/plugin_service_impl.h
|
| +++ b/content/browser/plugin_service_impl.h
|
| @@ -115,19 +115,6 @@ class CONTENT_EXPORT PluginServiceImpl
|
| virtual void AppActivated() OVERRIDE;
|
| #endif
|
|
|
| - // Returns the plugin process host corresponding to the plugin process that
|
| - // has been started by this service. This will start a process to host the
|
| - // 'plugin_path' if needed. If the process fails to start, the return value
|
| - // is NULL. Must be called on the IO thread.
|
| - PluginProcessHost* FindOrStartNpapiPluginProcess(
|
| - const FilePath& plugin_path);
|
| - PpapiPluginProcessHost* FindOrStartPpapiPluginProcess(
|
| - const FilePath& plugin_path,
|
| - const FilePath& profile_data_directory,
|
| - PpapiPluginProcessHost::PluginClient* client);
|
| - PpapiPluginProcessHost* FindOrStartPpapiBrokerProcess(
|
| - const FilePath& plugin_path);
|
| -
|
| // Opens a channel to a plugin process for the given mime type, starting
|
| // a new plugin process if necessary. This must be called on the IO thread
|
| // or else a deadlock can occur.
|
| @@ -162,6 +149,19 @@ class CONTENT_EXPORT PluginServiceImpl
|
| base::WaitableEvent* waitable_event) OVERRIDE;
|
|
|
| // Returns the plugin process host corresponding to the plugin process that
|
| + // has been started by this service. This will start a process to host the
|
| + // 'plugin_path' if needed. If the process fails to start, the return value
|
| + // is NULL. Must be called on the IO thread.
|
| + PluginProcessHost* FindOrStartNpapiPluginProcess(
|
| + const FilePath& plugin_path);
|
| + PpapiPluginProcessHost* FindOrStartPpapiPluginProcess(
|
| + const FilePath& plugin_path,
|
| + const FilePath& profile_data_directory,
|
| + PpapiPluginProcessHost::PluginClient* client);
|
| + PpapiPluginProcessHost* FindOrStartPpapiBrokerProcess(
|
| + const FilePath& plugin_path);
|
| +
|
| + // Returns the plugin process host corresponding to the plugin process that
|
| // has been started by this service. Returns NULL if no process has been
|
| // started.
|
| PluginProcessHost* FindNpapiPluginProcess(const FilePath& plugin_path);
|
|
|