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

Unified Diff: base/waitable_event_watcher.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 | « base/object_watcher_unittest.cc ('k') | base/waitable_event_watcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/waitable_event_watcher.h
===================================================================
--- base/waitable_event_watcher.h (revision 70358)
+++ base/waitable_event_watcher.h (working copy)
@@ -9,7 +9,7 @@
#include "build/build_config.h"
#if defined(OS_WIN)
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
#else
#include "base/message_loop.h"
#include "base/waitable_event.h"
@@ -124,7 +124,7 @@
// called Delegate (at least on Windows). Thus this object exists to proxy
// the callback function
// ---------------------------------------------------------------------------
- class ObjectWatcherHelper : public ObjectWatcher::Delegate {
+ class ObjectWatcherHelper : public win::ObjectWatcher::Delegate {
public:
ObjectWatcherHelper(WaitableEventWatcher* watcher);
@@ -140,7 +140,7 @@
void OnObjectSignaled();
ObjectWatcherHelper helper_;
- ObjectWatcher watcher_;
+ win::ObjectWatcher watcher_;
#else
// ---------------------------------------------------------------------------
// Implementation of MessageLoop::DestructionObserver
« no previous file with comments | « base/object_watcher_unittest.cc ('k') | base/waitable_event_watcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698