diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-02 06:05:39 +0000 |
| commit | 44f9c950c66c18b205f1dd56a793693899b5057a (patch) | |
| tree | 4d742f4838732d42bd7f536f8440df7aa0bbbcbf /ipc | |
| parent | f2bcc90abc6c33292592b17351973600b51e9b62 (diff) | |
| download | chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.zip chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.gz chromium_src-44f9c950c66c18b205f1dd56a793693899b5057a.tar.bz2 | |
Move CancellationFlag and WaitableEvent to the synchronization subdirectory.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5977010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_sync_channel.cc | 4 | ||||
| -rw-r--r-- | ipc/ipc_sync_channel.h | 2 | ||||
| -rw-r--r-- | ipc/ipc_sync_channel_unittest.cc | 2 | ||||
| -rw-r--r-- | ipc/ipc_sync_message.cc | 2 | ||||
| -rw-r--r-- | ipc/ipc_sync_message_filter.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 1382cf5..fbad0f6 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/threading/thread_local.h" -#include "base/waitable_event.h" -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event.h" +#include "base/synchronization/waitable_event_watcher.h" #include "ipc/ipc_sync_message.h" using base::TimeDelta; diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h index d1cef93..7f2f7f4 100644 --- a/ipc/ipc_sync_channel.h +++ b/ipc/ipc_sync_channel.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/lock.h" #include "base/ref_counted.h" -#include "base/waitable_event_watcher.h" +#include "base/synchronization/waitable_event_watcher.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_sync_message.h" diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc index b713c0a..19aa2f1 100644 --- a/ipc/ipc_sync_channel_unittest.cc +++ b/ipc/ipc_sync_channel_unittest.cc @@ -18,7 +18,7 @@ #include "base/third_party/dynamic_annotations/dynamic_annotations.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_message.h" #include "ipc/ipc_sync_message_filter.h" #include "ipc/ipc_sync_message_unittest.h" diff --git a/ipc/ipc_sync_message.cc b/ipc/ipc_sync_message.cc index 8ae65fa..21fae8f 100644 --- a/ipc/ipc_sync_message.cc +++ b/ipc/ipc_sync_message.cc @@ -11,7 +11,7 @@ #include "base/atomic_sequence_num.h" #include "base/logging.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_sync_message.h" namespace IPC { diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc index 833583c..17a4093 100644 --- a/ipc/ipc_sync_message_filter.cc +++ b/ipc/ipc_sync_message_filter.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/waitable_event.h" +#include "base/synchronization/waitable_event.h" #include "ipc/ipc_sync_message.h" namespace IPC { |