Index: content/renderer/p2p/socket_dispatcher.h |
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h |
index 58eade1139031e1bf599b154bf3d9333d77a15f2..eb81de39d220f200ac621b7f3eea08dfcc13e569 100644 |
--- a/content/renderer/p2p/socket_dispatcher.h |
+++ b/content/renderer/p2p/socket_dispatcher.h |
@@ -41,6 +41,10 @@ namespace net { |
class IPEndPoint; |
} // namespace net |
+namespace webkit_glue { |
+class NetworkListObserver; |
+} // webkit_glue |
+ |
namespace content { |
class P2PHostAddressRequest; |
@@ -51,30 +55,18 @@ class P2PSocketClient; |
// same thread. |
class CONTENT_EXPORT P2PSocketDispatcher : public content::RenderViewObserver { |
public: |
- class NetworkListObserver { |
- public: |
- virtual ~NetworkListObserver() { } |
- |
- virtual void OnNetworkListChanged( |
- const net::NetworkInterfaceList& list) = 0; |
- |
- protected: |
- NetworkListObserver() { } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(NetworkListObserver); |
- }; |
- |
explicit P2PSocketDispatcher(RenderViewImpl* render_view); |
virtual ~P2PSocketDispatcher(); |
// Add a new network list observer. Each observer is called |
- // immidiately after its't registered and then later whenever |
+ // immidiately after it is registered and then later whenever |
// network configuration changes. |
- void AddNetworkListObserver(NetworkListObserver* network_list_observer); |
+ void AddNetworkListObserver( |
+ webkit_glue::NetworkListObserver* network_list_observer); |
// Removes network list observer. |
- void RemoveNetworkListObserver(NetworkListObserver* network_list_observer); |
+ void RemoveNetworkListObserver( |
+ webkit_glue::NetworkListObserver* network_list_observer); |
// RenderViewObserver overrides. |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
@@ -113,7 +105,7 @@ class CONTENT_EXPORT P2PSocketDispatcher : public content::RenderViewObserver { |
IDMap<P2PHostAddressRequest> host_address_requests_; |
bool network_notifications_started_; |
- scoped_refptr<ObserverListThreadSafe<NetworkListObserver> > |
+ scoped_refptr<ObserverListThreadSafe<webkit_glue::NetworkListObserver> > |
network_list_observers_; |
scoped_refptr<AsyncMessageSender> async_message_sender_; |