| Index: net/base/network_config_watcher_mac.h
|
| diff --git a/net/base/network_config_watcher_mac.h b/net/base/network_config_watcher_mac.h
|
| index f9f9d3636aa6adc9768108c391f871d0a4853f8d..3bd55f97590cc1537640c7dcc27555a3fa5db50c 100644
|
| --- a/net/base/network_config_watcher_mac.h
|
| +++ b/net/base/network_config_watcher_mac.h
|
| @@ -19,7 +19,7 @@ class Thread;
|
| namespace net {
|
|
|
| // Base class for watching the Mac OS system network settings.
|
| -class NetworkConfigWatcherMac : public MessageLoop::DestructionObserver {
|
| +class NetworkConfigWatcherMac {
|
| public:
|
| // NOTE: The lifetime of Delegate is expected to exceed the lifetime of
|
| // NetworkConfigWatcherMac.
|
| @@ -41,24 +41,11 @@ class NetworkConfigWatcherMac : public MessageLoop::DestructionObserver {
|
| virtual ~NetworkConfigWatcherMac();
|
|
|
| private:
|
| - // MessageLoop::DestructionObserver:
|
| - virtual void WillDestroyCurrentMessageLoop();
|
| -
|
| - // Called on the notifier thread to initialize the notification
|
| - // implementation. The SystemConfiguration calls in this function can lead to
|
| - // contention early on, so we invoke this function later on in startup to keep
|
| - // it fast.
|
| - void Init();
|
| -
|
| // The thread used to listen for notifications. This relays the notification
|
| // to the registered observers without posting back to the thread the object
|
| // was created on.
|
| scoped_ptr<base::Thread> notifier_thread_;
|
|
|
| - base::mac::ScopedCFTypeRef<CFRunLoopSourceRef> run_loop_source_;
|
| -
|
| - Delegate* const delegate_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(NetworkConfigWatcherMac);
|
| };
|
|
|
|
|