| Index: content/browser/renderer_host/pepper_message_filter.h
|
| diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h
|
| index cccff7cf144715b4950d8e4572e3ccaf4a43a49f..32701528b7c3ec36cd3064c55fdca7080a05b10f 100644
|
| --- a/content/browser/renderer_host/pepper_message_filter.h
|
| +++ b/content/browser/renderer_host/pepper_message_filter.h
|
| @@ -15,6 +15,8 @@
|
| #include "base/process.h"
|
| #include "base/time.h"
|
| #include "content/public/browser/browser_message_filter.h"
|
| +#include "net/base/network_change_notifier.h"
|
| +#include "net/base/net_util.h"
|
| #include "net/base/ssl_config_service.h"
|
| #include "net/socket/stream_socket.h"
|
| #include "ppapi/c/pp_stdint.h"
|
| @@ -40,7 +42,9 @@ class HostResolver;
|
| // 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.
|
| -class PepperMessageFilter : public content::BrowserMessageFilter {
|
| +class PepperMessageFilter
|
| + : public content::BrowserMessageFilter,
|
| + public net::NetworkChangeNotifier::IPAddressObserver {
|
| public:
|
| enum ProcessType { PLUGIN, RENDERER };
|
|
|
| @@ -64,6 +68,9 @@ class PepperMessageFilter : public content::BrowserMessageFilter {
|
| virtual bool OnMessageReceived(const IPC::Message& message,
|
| bool* message_was_ok) OVERRIDE;
|
|
|
| + // net::NetworkChangeNotifier::IPAddressObserver interface.
|
| + virtual void OnIPAddressChanged() OVERRIDE;
|
| +
|
| // Returns the host resolver (it may come from the resource context or the
|
| // host_resolver_ member).
|
| net::HostResolver* GetHostResolver();
|
| @@ -82,6 +89,12 @@ class PepperMessageFilter : public content::BrowserMessageFilter {
|
| const net::SSLConfig& ssl_config() { return ssl_config_; }
|
|
|
| private:
|
| + typedef std::map<uint32, linked_ptr<PepperTCPSocket> > TCPSocketMap;
|
| + typedef std::map<uint32, linked_ptr<PepperUDPSocket> > UDPSocketMap;
|
| + typedef std::map<uint32,
|
| + linked_ptr<PepperTCPServerSocket> > TCPServerSocketMap;
|
| + typedef std::set<uint32> NetworkMonitorIdSet;
|
| +
|
| #if defined(ENABLE_FLAPPER_HACKS)
|
| // Message handlers.
|
| void OnConnectTcp(int routing_id,
|
| @@ -153,6 +166,9 @@ class PepperMessageFilter : public content::BrowserMessageFilter {
|
| int32_t backlog);
|
| void OnTCPServerAccept(uint32 real_socket_id);
|
|
|
| + void OnNetworkMonitorStart(uint32 plugin_dispatcher_id);
|
| + void OnNetworkMonitorStop(uint32 plugin_dispatcher_id);
|
| +
|
| void DoTCPConnect(bool allowed,
|
| int32 routing_id,
|
| uint32 socket_id,
|
| @@ -182,6 +198,10 @@ class PepperMessageFilter : public content::BrowserMessageFilter {
|
| // Return true if render with given ID can use socket APIs.
|
| bool CanUseSocketAPIs(int32 render_id);
|
|
|
| + void GetAndSendNetworkList();
|
| + void DoGetNetworkList(net::NetworkInterfaceList* list);
|
| + void SendNetworkList(scoped_ptr<net::NetworkInterfaceList> list);
|
| +
|
| ProcessType process_type_;
|
|
|
| // Render process ID.
|
| @@ -202,16 +222,13 @@ class PepperMessageFilter : public content::BrowserMessageFilter {
|
|
|
| uint32 next_socket_id_;
|
|
|
| - typedef std::map<uint32, linked_ptr<PepperTCPSocket> > TCPSocketMap;
|
| TCPSocketMap tcp_sockets_;
|
| -
|
| - typedef std::map<uint32, linked_ptr<PepperUDPSocket> > UDPSocketMap;
|
| UDPSocketMap udp_sockets_;
|
| -
|
| - typedef std::map<uint32,
|
| - linked_ptr<PepperTCPServerSocket> > TCPServerSocketMap;
|
| TCPServerSocketMap tcp_server_sockets_;
|
|
|
| + NetworkMonitorIdSet network_monitor_ids_;
|
| + bool monitoring_networks_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(PepperMessageFilter);
|
| };
|
|
|
|
|