diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:04:55 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:04:55 +0000 |
| commit | 905cda8107a17b368a065bbfbc02b449a66c9feb (patch) | |
| tree | 59c576fb45e11178826514d8d7c89bf4776cd22d /ipc | |
| parent | 096d2b8ced438c307520ff7a89c3cf4aa941c4ad (diff) | |
| download | chromium_src-905cda8107a17b368a065bbfbc02b449a66c9feb.zip chromium_src-905cda8107a17b368a065bbfbc02b449a66c9feb.tar.gz chromium_src-905cda8107a17b368a065bbfbc02b449a66c9feb.tar.bz2 | |
Add base:: to string16s in ipc/.
R=tsepez@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/108793005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242050 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, 4 insertions, 4 deletions
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 8c08500..802a0a2 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -183,7 +183,7 @@ bool Channel::ChannelImpl::DidEmptyInputBuffers() { } // static -const string16 Channel::ChannelImpl::PipeName( +const base::string16 Channel::ChannelImpl::PipeName( const std::string& channel_id, int32* secret) { std::string name("\\\\.\\pipe\\chrome."); @@ -204,7 +204,7 @@ const string16 Channel::ChannelImpl::PipeName( bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle &channel_handle, Mode mode) { DCHECK_EQ(INVALID_HANDLE_VALUE, pipe_); - string16 pipe_name; + base::string16 pipe_name; // If we already have a valid pipe for channel just copy it. if (channel_handle.pipe.handle) { DCHECK(channel_handle.name.empty()); diff --git a/ipc/ipc_channel_win.h b/ipc/ipc_channel_win.h index a544f8b..5bdba93 100644 --- a/ipc/ipc_channel_win.h +++ b/ipc/ipc_channel_win.h @@ -43,8 +43,8 @@ class Channel::ChannelImpl : public internal::ChannelReader, bool DidEmptyInputBuffers() OVERRIDE; virtual void HandleInternalMessage(const Message& msg) OVERRIDE; - static const string16 PipeName(const std::string& channel_id, - int32* secret); + static const base::string16 PipeName(const std::string& channel_id, + int32* secret); bool CreatePipe(const IPC::ChannelHandle &channel_handle, Mode mode); bool ProcessConnection(); |