Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: net/base/listen_socket.h

Issue 5971008: move base/object_watcher into base/win and add the win namespace. Fixup calle... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/win_event_receiver.cc ('k') | net/base/network_change_notifier_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/listen_socket.h
===================================================================
--- net/base/listen_socket.h (revision 70358)
+++ net/base/listen_socket.h (working copy)
@@ -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 @@
// 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 @@
#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_;
« no previous file with comments | « chrome_frame/test/win_event_receiver.cc ('k') | net/base/network_change_notifier_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698