| 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 6c5dafa0233376915e0138c21852778965e1ddf6..c0154b08146f7f45f0f392796d8dec1479883bc3 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| @@ -17,6 +17,7 @@
|
| #include "base/time.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| +#include "content/public/common/process_type.h"
|
| #include "net/base/net_util.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/base/ssl_config_service.h"
|
| @@ -62,23 +63,21 @@ class PepperMessageFilter
|
| : public BrowserMessageFilter,
|
| public net::NetworkChangeNotifier::IPAddressObserver {
|
| public:
|
| - enum ProcessType { PLUGIN, RENDERER, NACL };
|
| -
|
| // Constructor when used in the context of a render process (the argument is
|
| - // provided for sanity checking and must be RENDERER).
|
| - PepperMessageFilter(ProcessType type,
|
| + // provided for sanity checking and must be PROCESS_TYPE_RENDERER).
|
| + PepperMessageFilter(ProcessType process_type,
|
| int process_id,
|
| BrowserContext* browser_context);
|
|
|
| // Constructor when used in the context of a PPAPI process (the argument is
|
| - // provided for sanity checking and must be PLUGIN).
|
| - PepperMessageFilter(ProcessType type,
|
| + // provided for sanity checking and must be PROCESS_TYPE_PPAPI_PLUGIN).
|
| + PepperMessageFilter(ProcessType process_type,
|
| const ppapi::PpapiPermissions& permissions,
|
| net::HostResolver* host_resolver);
|
|
|
| // Constructor when used in the context of a NaCl process (the argument is
|
| - // provided for sanity checking and must be NACL).
|
| - PepperMessageFilter(ProcessType type,
|
| + // provided for sanity checking and must be PROCESS_TYPE_NACL_LOADER).
|
| + PepperMessageFilter(ProcessType process_type,
|
| const ppapi::PpapiPermissions& permissions,
|
| net::HostResolver* host_resolver,
|
| int process_id,
|
| @@ -244,10 +243,6 @@ class PepperMessageFilter
|
| bool CanUseSocketAPIs(int32 render_id,
|
| const content::SocketPermissionRequest& params);
|
|
|
| - content::SocketPermissionRequest CreateSocketPermissionRequest(
|
| - content::SocketPermissionRequest::OperationType type,
|
| - const PP_NetAddress_Private& net_addr);
|
| -
|
| void GetAndSendNetworkList();
|
| void DoGetNetworkList();
|
| void SendNetworkList(scoped_ptr<net::NetworkInterfaceList> list);
|
|
|