summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 18:26:16 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-01 18:26:16 +0000
commita8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb (patch)
tree2ed96a278f2d3082db68f361992d054a08cc915d /chrome_frame
parent0378bf4edc40686bac06c8e14bd25fdb3f9cfb28 (diff)
downloadchromium_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 'chrome_frame')
-rw-r--r--chrome_frame/test/win_event_receiver.cc6
-rw-r--r--chrome_frame/test/win_event_receiver.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/chrome_frame/test/win_event_receiver.cc b/chrome_frame/test/win_event_receiver.cc
index b05d807..a187556 100644
--- a/chrome_frame/test/win_event_receiver.cc
+++ b/chrome_frame/test/win_event_receiver.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
#include "base/string_util.h"
#include "chrome_frame/function_stub.h"
@@ -78,7 +78,7 @@ void WinEventReceiver::WinEventHook(WinEventReceiver* me, HWINEVENTHOOK hook,
// Notification is always delivered via a message loop task in the message loop
// that is active when the instance is constructed.
class WindowWatchdog::ProcessExitObserver
- : public base::ObjectWatcher::Delegate {
+ : public base::win::ObjectWatcher::Delegate {
public:
// Initiates the process watch. Will always return without notifying the
// watchdog.
@@ -94,7 +94,7 @@ class WindowWatchdog::ProcessExitObserver
HWND hwnd_;
ScopedRunnableMethodFactory<ProcessExitObserver> method_task_factory_;
- base::ObjectWatcher object_watcher_;
+ base::win::ObjectWatcher object_watcher_;
DISALLOW_COPY_AND_ASSIGN(ProcessExitObserver);
};
diff --git a/chrome_frame/test/win_event_receiver.h b/chrome_frame/test/win_event_receiver.h
index 7a191e50..9d413de 100644
--- a/chrome_frame/test/win_event_receiver.h
+++ b/chrome_frame/test/win_event_receiver.h
@@ -12,7 +12,7 @@
#include <utility>
#include "base/linked_ptr.h"
-#include "base/object_watcher.h"
+#include "base/win/object_watcher.h"
struct FunctionStub;
@@ -106,8 +106,8 @@ class WindowWatchdog : public WinEventListener {
// The Delegate object is actually a ProcessExitObserver, but declaring
// it as such would require fully declaring the ProcessExitObserver class
// here in order for linked_ptr to access its destructor.
- typedef std::pair<HWND, linked_ptr<base::ObjectWatcher::Delegate> >
- OpenWindowEntry;
+ typedef std::pair<HWND, linked_ptr<base::win::ObjectWatcher::Delegate> >
+ OpenWindowEntry;
typedef std::vector<OpenWindowEntry> OpenWindowList;
struct ObserverEntry {
@@ -121,7 +121,7 @@ class WindowWatchdog : public WinEventListener {
// WinEventListener implementation.
virtual void OnEventReceived(
- DWORD event, HWND hwnd, LONG object_id, LONG child_id);
+ DWORD event, HWND hwnd, LONG object_id, LONG child_id);
static std::string GetWindowCaption(HWND hwnd);