| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // This class responds to requests from renderers for the list of plugins, and | 5 // This class responds to requests from renderers for the list of plugins, and |
| 6 // also a proxy object for plugin instances. | 6 // also a proxy object for plugin instances. |
| 7 | 7 |
| 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_ | 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_ |
| 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_ | 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_ |
| 10 #pragma once | 10 #pragma once |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 PpapiPluginProcessHost* FindPpapiPluginProcess(const FilePath& plugin_path); | 72 PpapiPluginProcessHost* FindPpapiPluginProcess(const FilePath& plugin_path); |
| 73 PpapiBrokerProcessHost* FindPpapiBrokerProcess(const FilePath& broker_path); | 73 PpapiBrokerProcessHost* FindPpapiBrokerProcess(const FilePath& broker_path); |
| 74 | 74 |
| 75 // Returns the plugin process host corresponding to the plugin process that | 75 // Returns the plugin process host corresponding to the plugin process that |
| 76 // has been started by this service. This will start a process to host the | 76 // has been started by this service. This will start a process to host the |
| 77 // 'plugin_path' if needed. If the process fails to start, the return value | 77 // 'plugin_path' if needed. If the process fails to start, the return value |
| 78 // is NULL. Must be called on the IO thread. | 78 // is NULL. Must be called on the IO thread. |
| 79 PluginProcessHost* FindOrStartNpapiPluginProcess( | 79 PluginProcessHost* FindOrStartNpapiPluginProcess( |
| 80 const FilePath& plugin_path); | 80 const FilePath& plugin_path); |
| 81 PpapiPluginProcessHost* FindOrStartPpapiPluginProcess( | 81 PpapiPluginProcessHost* FindOrStartPpapiPluginProcess( |
| 82 const FilePath& plugin_path); | 82 const FilePath& plugin_path, |
| 83 PpapiPluginProcessHost::Client* client); |
| 83 PpapiBrokerProcessHost* FindOrStartPpapiBrokerProcess( | 84 PpapiBrokerProcessHost* FindOrStartPpapiBrokerProcess( |
| 84 const FilePath& plugin_path); | 85 const FilePath& plugin_path); |
| 85 | 86 |
| 86 // Opens a channel to a plugin process for the given mime type, starting | 87 // Opens a channel to a plugin process for the given mime type, starting |
| 87 // a new plugin process if necessary. This must be called on the IO thread | 88 // a new plugin process if necessary. This must be called on the IO thread |
| 88 // or else a deadlock can occur. | 89 // or else a deadlock can occur. |
| 89 void OpenChannelToNpapiPlugin(int render_process_id, | 90 void OpenChannelToNpapiPlugin(int render_process_id, |
| 90 int render_view_id, | 91 int render_view_id, |
| 91 const GURL& url, | 92 const GURL& url, |
| 92 const std::string& mime_type, | 93 const std::string& mime_type, |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 | 200 |
| 200 std::vector<OverriddenPlugin> overridden_plugins_; | 201 std::vector<OverriddenPlugin> overridden_plugins_; |
| 201 base::Lock overridden_plugins_lock_; | 202 base::Lock overridden_plugins_lock_; |
| 202 | 203 |
| 203 DISALLOW_COPY_AND_ASSIGN(PluginService); | 204 DISALLOW_COPY_AND_ASSIGN(PluginService); |
| 204 }; | 205 }; |
| 205 | 206 |
| 206 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService); | 207 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService); |
| 207 | 208 |
| 208 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_ | 209 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_ |
| OLD | NEW |