diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:26:16 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:26:16 +0000 |
| commit | a8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb (patch) | |
| tree | 2ed96a278f2d3082db68f361992d054a08cc915d /net/base | |
| parent | 0378bf4edc40686bac06c8e14bd25fdb3f9cfb28 (diff) | |
| download | chromium_src-a8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb.zip chromium_src-a8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb.tar.gz chromium_src-a8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb.tar.bz2 | |
move base/object_watcher into base/win and add the win namespace. Fixup callers.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5971008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/listen_socket.h | 6 | ||||
| -rw-r--r-- | net/base/network_change_notifier_win.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/base/listen_socket.h b/net/base/listen_socket.h index e730b82..641ae51 100644 --- a/net/base/listen_socket.h +++ b/net/base/listen_socket.h @@ -19,7 +19,7 @@ #endif #include <string> #if defined(OS_WIN) -#include "base/object_watcher.h" +#include "base/win/object_watcher.h" #elif defined(OS_POSIX) #include "base/message_loop.h" #endif @@ -35,7 +35,7 @@ typedef int SOCKET; // Implements a raw socket interface class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>, #if defined(OS_WIN) - public base::ObjectWatcher::Delegate + public base::win::ObjectWatcher::Delegate #elif defined(OS_POSIX) public MessageLoopForIO::Watcher #endif @@ -107,7 +107,7 @@ class ListenSocket : public base::RefCountedThreadSafe<ListenSocket>, #if defined(OS_WIN) // ObjectWatcher delegate virtual void OnObjectSignaled(HANDLE object); - base::ObjectWatcher watcher_; + base::win::ObjectWatcher watcher_; HANDLE socket_event_; #elif defined(OS_POSIX) WaitState wait_state_; diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h index 44782c7..c76f7fd 100644 --- a/net/base/network_change_notifier_win.h +++ b/net/base/network_change_notifier_win.h @@ -9,13 +9,13 @@ #include <windows.h> #include "base/basictypes.h" -#include "base/object_watcher.h" +#include "base/win/object_watcher.h" #include "net/base/network_change_notifier.h" namespace net { class NetworkChangeNotifierWin : public NetworkChangeNotifier, - public base::ObjectWatcher::Delegate { + public base::win::ObjectWatcher::Delegate { public: NetworkChangeNotifierWin(); @@ -31,7 +31,7 @@ class NetworkChangeNotifierWin : public NetworkChangeNotifier, // Begins listening for a single subsequent address change. void WatchForAddressChange(); - base::ObjectWatcher addr_watcher_; + base::win::ObjectWatcher addr_watcher_; OVERLAPPED addr_overlapped_; DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierWin); |