diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 03:09:41 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 03:09:41 +0000 |
| commit | 84aebedeaa91c3fadf523260c12afa136420c7d3 (patch) | |
| tree | c5ca8ca0e7bd3f5dba957556cbb062851b4d7853 /net/base/network_change_notifier_linux.h | |
| parent | efeaf7e7f80c74b91aa87edbbb0ace868f3574a7 (diff) | |
| download | chromium_src-84aebedeaa91c3fadf523260c12afa136420c7d3.zip chromium_src-84aebedeaa91c3fadf523260c12afa136420c7d3.tar.gz chromium_src-84aebedeaa91c3fadf523260c12afa136420c7d3.tar.bz2 | |
Reland 39942 - Switch NetworkChangeNotifier implementations to use ObserverList.
Fixed build problem with database_tracker.(cc|h).
BUG=36590
Review URL: http://codereview.chromium.org/660039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/network_change_notifier_linux.h')
| -rw-r--r-- | net/base/network_change_notifier_linux.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/base/network_change_notifier_linux.h b/net/base/network_change_notifier_linux.h index 323ea55..91d73e8 100644 --- a/net/base/network_change_notifier_linux.h +++ b/net/base/network_change_notifier_linux.h @@ -7,7 +7,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" -#include "net/base/network_change_notifier_helper.h" +#include "base/observer_list.h" +#include "net/base/network_change_notifier.h" namespace net { @@ -19,11 +20,11 @@ class NetworkChangeNotifierLinux // NetworkChangeNotifier methods: virtual void AddObserver(Observer* observer) { - helper_.AddObserver(observer); + observers_.AddObserver(observer); } virtual void RemoveObserver(Observer* observer) { - helper_.RemoveObserver(observer); + observers_.RemoveObserver(observer); } // MessageLoopForIO::Watcher methods: @@ -46,7 +47,7 @@ class NetworkChangeNotifierLinux // Handles the netlink message and notifies the observers. void HandleNotifications(const char* buf, size_t len); - internal::NetworkChangeNotifierHelper helper_; + ObserverList<Observer, true> observers_; int netlink_fd_; // This is the netlink socket descriptor. MessageLoopForIO* const loop_; |