diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 04:48:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 04:48:49 +0000 |
| commit | c91775096768e4a75b23a910ddc1e33d9412a3be (patch) | |
| tree | cb807f9b28d88b4950e41d32fbe73a5c81a94c40 /ipc | |
| parent | e0eb450f398ae888aa0fbdb7fd3abc072d5846a2 (diff) | |
| download | chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.zip chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.gz chromium_src-c91775096768e4a75b23a910ddc1e33d9412a3be.tar.bz2 | |
Move non_thread_safe from base to base/threading and into the base namespace.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6005010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_channel_win.cc | 4 | ||||
| -rw-r--r-- | ipc/ipc_channel_win.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 823c2bb..ee58701 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -11,7 +11,7 @@ #include "base/auto_reset.h" #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/non_thread_safe.h" +#include "base/threading/non_thread_safe.h" #include "base/utf_string_conversions.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" @@ -250,7 +250,7 @@ bool Channel::ChannelImpl::Connect() { DLOG_IF(WARNING, thread_check_.get()) << "Connect called more than once"; if (!thread_check_.get()) - thread_check_.reset(new NonThreadSafe()); + thread_check_.reset(new base::NonThreadSafe()); if (pipe_ == INVALID_HANDLE_VALUE) return false; diff --git a/ipc/ipc_channel_win.h b/ipc/ipc_channel_win.h index 82b70db..eb38777 100644 --- a/ipc/ipc_channel_win.h +++ b/ipc/ipc_channel_win.h @@ -14,7 +14,9 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" +namespace base { class NonThreadSafe; +} namespace IPC { @@ -78,7 +80,7 @@ class Channel::ChannelImpl : public MessageLoopForIO::IOHandler { ScopedRunnableMethodFactory<ChannelImpl> factory_; - scoped_ptr<NonThreadSafe> thread_check_; + scoped_ptr<base::NonThreadSafe> thread_check_; DISALLOW_COPY_AND_ASSIGN(ChannelImpl); }; |