| Index: content/browser/renderer_host/pepper/pepper_message_filter.h
|
| diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| index 3d17193451ef95c07837deaa051f4c5e5f83f278..a2aa226264feba67ae9da8a85950f77b9c6f94c6 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| @@ -23,25 +23,13 @@ class PPB_X509Certificate_Fields;
|
|
|
| namespace content {
|
|
|
| -// This class is used in two contexts, both supporting PPAPI plugins. The first
|
| -// is on the renderer->browser channel, to handle requests from in-process
|
| -// PPAPI plugins and any requests that the PPAPI implementation code in the
|
| -// renderer needs to make. The second is on the plugin->browser channel to
|
| -// handle requests that out-of-process plugins send directly to the browser.
|
| +// Message filter that handles IPC for PPB_NetworkMonitor_Private and
|
| +// PPB_X509Certificate_Private.
|
| class PepperMessageFilter
|
| : public BrowserMessageFilter,
|
| public net::NetworkChangeNotifier::IPAddressObserver {
|
| public:
|
| - // Factory method used in the context of a renderer process.
|
| - static PepperMessageFilter* CreateForRendererProcess();
|
| -
|
| - // Factory method used in the context of a PPAPI process.
|
| - static PepperMessageFilter* CreateForPpapiPluginProcess(
|
| - const ppapi::PpapiPermissions& permissions);
|
| -
|
| - // Factory method used in the context of an external plugin,
|
| - static PepperMessageFilter* CreateForExternalPluginProcess(
|
| - const ppapi::PpapiPermissions& permissions);
|
| + explicit PepperMessageFilter(const ppapi::PpapiPermissions& permissions);
|
|
|
| // BrowserMessageFilter methods.
|
| virtual bool OnMessageReceived(const IPC::Message& message,
|
| @@ -58,17 +46,6 @@ class PepperMessageFilter
|
| // notifications.
|
| typedef std::set<uint32> NetworkMonitorIdSet;
|
|
|
| - enum PluginType {
|
| - PLUGIN_TYPE_IN_PROCESS,
|
| - PLUGIN_TYPE_OUT_OF_PROCESS,
|
| - // External plugin means it was created through
|
| - // BrowserPpapiHost::CreateExternalPluginProcess.
|
| - PLUGIN_TYPE_EXTERNAL_PLUGIN,
|
| - };
|
| -
|
| - PepperMessageFilter(const ppapi::PpapiPermissions& permissions,
|
| - PluginType plugin_type);
|
| -
|
| void OnNetworkMonitorStart(uint32 plugin_dispatcher_id);
|
| void OnNetworkMonitorStop(uint32 plugin_dispatcher_id);
|
|
|
| @@ -80,8 +57,6 @@ class PepperMessageFilter
|
| void DoGetNetworkList();
|
| void SendNetworkList(scoped_ptr<net::NetworkInterfaceList> list);
|
|
|
| - PluginType plugin_type_;
|
| -
|
| // When attached to an out-of-process plugin (be it native or NaCl) this
|
| // will have the Pepper permissions for the plugin. When attached to the
|
| // renderer channel, this will have no permissions listed (since there may
|
|
|