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

Side by Side Diff: ipc/ipc_channel_win.cc

Issue 108793005: Add base:: to string16s in ipc/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ipc/ipc_channel_win.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ipc/ipc_channel_win.h" 5 #include "ipc/ipc_channel_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 validate_client_ = false; 176 validate_client_ = false;
177 listener()->OnChannelConnected(claimed_pid); 177 listener()->OnChannelConnected(claimed_pid);
178 } 178 }
179 179
180 bool Channel::ChannelImpl::DidEmptyInputBuffers() { 180 bool Channel::ChannelImpl::DidEmptyInputBuffers() {
181 // We don't need to do anything here. 181 // We don't need to do anything here.
182 return true; 182 return true;
183 } 183 }
184 184
185 // static 185 // static
186 const string16 Channel::ChannelImpl::PipeName( 186 const base::string16 Channel::ChannelImpl::PipeName(
187 const std::string& channel_id, int32* secret) { 187 const std::string& channel_id, int32* secret) {
188 std::string name("\\\\.\\pipe\\chrome."); 188 std::string name("\\\\.\\pipe\\chrome.");
189 189
190 // Prevent the shared secret from ending up in the pipe name. 190 // Prevent the shared secret from ending up in the pipe name.
191 size_t index = channel_id.find_first_of('\\'); 191 size_t index = channel_id.find_first_of('\\');
192 if (index != std::string::npos) { 192 if (index != std::string::npos) {
193 if (secret) // Retrieve the secret if asked for. 193 if (secret) // Retrieve the secret if asked for.
194 base::StringToInt(channel_id.substr(index + 1), secret); 194 base::StringToInt(channel_id.substr(index + 1), secret);
195 return ASCIIToWide(name.append(channel_id.substr(0, index - 1))); 195 return ASCIIToWide(name.append(channel_id.substr(0, index - 1)));
196 } 196 }
197 197
198 // This case is here to support predictable named pipes in tests. 198 // This case is here to support predictable named pipes in tests.
199 if (secret) 199 if (secret)
200 *secret = 0; 200 *secret = 0;
201 return ASCIIToWide(name.append(channel_id)); 201 return ASCIIToWide(name.append(channel_id));
202 } 202 }
203 203
204 bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle &channel_handle, 204 bool Channel::ChannelImpl::CreatePipe(const IPC::ChannelHandle &channel_handle,
205 Mode mode) { 205 Mode mode) {
206 DCHECK_EQ(INVALID_HANDLE_VALUE, pipe_); 206 DCHECK_EQ(INVALID_HANDLE_VALUE, pipe_);
207 string16 pipe_name; 207 base::string16 pipe_name;
208 // If we already have a valid pipe for channel just copy it. 208 // If we already have a valid pipe for channel just copy it.
209 if (channel_handle.pipe.handle) { 209 if (channel_handle.pipe.handle) {
210 DCHECK(channel_handle.name.empty()); 210 DCHECK(channel_handle.name.empty());
211 pipe_name = L"Not Available"; // Just used for LOG 211 pipe_name = L"Not Available"; // Just used for LOG
212 // Check that the given pipe confirms to the specified mode. We can 212 // Check that the given pipe confirms to the specified mode. We can
213 // only check for PIPE_TYPE_MESSAGE & PIPE_SERVER_END flags since the 213 // only check for PIPE_TYPE_MESSAGE & PIPE_SERVER_END flags since the
214 // other flags (PIPE_TYPE_BYTE, and PIPE_CLIENT_END) are defined as 0. 214 // other flags (PIPE_TYPE_BYTE, and PIPE_CLIENT_END) are defined as 0.
215 DWORD flags = 0; 215 DWORD flags = 0;
216 GetNamedPipeInfo(channel_handle.pipe.handle, &flags, NULL, NULL, NULL); 216 GetNamedPipeInfo(channel_handle.pipe.handle, &flags, NULL, NULL, NULL);
217 DCHECK(!(flags & PIPE_TYPE_MESSAGE)); 217 DCHECK(!(flags & PIPE_TYPE_MESSAGE));
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 int secret; 509 int secret;
510 do { // Guarantee we get a non-zero value. 510 do { // Guarantee we get a non-zero value.
511 secret = base::RandInt(0, std::numeric_limits<int>::max()); 511 secret = base::RandInt(0, std::numeric_limits<int>::max());
512 } while (secret == 0); 512 } while (secret == 0);
513 513
514 id.append(GenerateUniqueRandomChannelID()); 514 id.append(GenerateUniqueRandomChannelID());
515 return id.append(base::StringPrintf("\\%d", secret)); 515 return id.append(base::StringPrintf("\\%d", secret));
516 } 516 }
517 517
518 } // namespace IPC 518 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/ipc_channel_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698