From 232a58169700ed7abde79d9858c288eb21409e60 Mon Sep 17 00:00:00 2001 From: "adamk@chromium.org" Date: Fri, 4 Mar 2011 22:42:08 +0000 Subject: Plumb through NetworkChangeNotifier::IsOffline() to WebKit, enabling navigator.onLine and online/offline events. Only works on Windows at the moment, as IsCurrentlyOffline() is supported only by NetworkChangeNotifierWin. Most of the changes are due to the need to support two different kinds of NetworkChangeNotifier observers. Both observers currently happen to trigger on the same event, but that could change, e.g., if we store the previous online state and only notify on a change. Thus the need for two different observer interfaces, and associated Add/Remove methods. BUG=7469 TEST=Load https://bug336359.bugzilla.mozilla.org/attachment.cgi?id=220609, unplug network cable, reload, see that page changes to note offline status Review URL: http://codereview.chromium.org/6526059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76985 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/client_socket_pool_base.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/socket/client_socket_pool_base.cc') diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 64fb831..8aaf1b5 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -163,7 +163,7 @@ ClientSocketPoolBaseHelper::ClientSocketPoolBaseHelper( DCHECK_LE(0, max_sockets_per_group); DCHECK_LE(max_sockets_per_group, max_sockets); - NetworkChangeNotifier::AddObserver(this); + NetworkChangeNotifier::AddIPAddressObserver(this); } ClientSocketPoolBaseHelper::~ClientSocketPoolBaseHelper() { @@ -175,7 +175,7 @@ ClientSocketPoolBaseHelper::~ClientSocketPoolBaseHelper() { DCHECK(pending_callback_map_.empty()); DCHECK_EQ(0, connecting_socket_count_); - NetworkChangeNotifier::RemoveObserver(this); + NetworkChangeNotifier::RemoveIPAddressObserver(this); } // InsertRequestIntoQueue inserts the request into the queue based on -- cgit v1.1