| 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 a2aa226264feba67ae9da8a85950f77b9c6f94c6..3f5010ed40e32e1005c785ab266953522e5c128e 100644
|
| --- a/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| +++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
|
| @@ -5,17 +5,12 @@
|
| #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_MESSAGE_FILTER_H_
|
| #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_PEPPER_MESSAGE_FILTER_H_
|
|
|
| -#include <set>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/files/file_path.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| -#include "net/base/net_util.h"
|
| -#include "net/base/network_change_notifier.h"
|
| -#include "ppapi/shared_impl/ppapi_permissions.h"
|
|
|
| namespace ppapi {
|
| class PPB_X509Certificate_Fields;
|
| @@ -23,48 +18,23 @@ class PPB_X509Certificate_Fields;
|
|
|
| namespace content {
|
|
|
| -// Message filter that handles IPC for PPB_NetworkMonitor_Private and
|
| -// PPB_X509Certificate_Private.
|
| -class PepperMessageFilter
|
| - : public BrowserMessageFilter,
|
| - public net::NetworkChangeNotifier::IPAddressObserver {
|
| +// Message filter that handles IPC for PPB_X509Certificate_Private.
|
| +class PepperMessageFilter : public BrowserMessageFilter {
|
| public:
|
| - explicit PepperMessageFilter(const ppapi::PpapiPermissions& permissions);
|
| + PepperMessageFilter();
|
|
|
| // BrowserMessageFilter methods.
|
| virtual bool OnMessageReceived(const IPC::Message& message,
|
| bool* message_was_ok) OVERRIDE;
|
|
|
| - // net::NetworkChangeNotifier::IPAddressObserver interface.
|
| - virtual void OnIPAddressChanged() OVERRIDE;
|
| -
|
| protected:
|
| virtual ~PepperMessageFilter();
|
|
|
| private:
|
| - // Set of disptachers ID's that have subscribed for NetworkMonitor
|
| - // notifications.
|
| - typedef std::set<uint32> NetworkMonitorIdSet;
|
| -
|
| - void OnNetworkMonitorStart(uint32 plugin_dispatcher_id);
|
| - void OnNetworkMonitorStop(uint32 plugin_dispatcher_id);
|
| -
|
| void OnX509CertificateParseDER(const std::vector<char>& der,
|
| bool* succeeded,
|
| ppapi::PPB_X509Certificate_Fields* result);
|
|
|
| - void GetAndSendNetworkList();
|
| - void DoGetNetworkList();
|
| - void SendNetworkList(scoped_ptr<net::NetworkInterfaceList> list);
|
| -
|
| - // 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
|
| - // be many plugins sharing this channel).
|
| - ppapi::PpapiPermissions permissions_;
|
| -
|
| - NetworkMonitorIdSet network_monitor_ids_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(PepperMessageFilter);
|
| };
|
|
|
|
|