summaryrefslogtreecommitdiffstats
path: root/chrome/common/resource_dispatcher.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 03:25:15 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 03:25:15 +0000
commit176aa48371da91eb98d675d87b4e70c7b26d696f (patch)
tree4c972de6ecd5a54650ab1dc7d421187f5d25834f /chrome/common/resource_dispatcher.cc
parent9a3f0ac2899139ace97e399015259d028b4d5704 (diff)
downloadchromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.zip
chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.gz
chromium_src-176aa48371da91eb98d675d87b4e70c7b26d696f.tar.bz2
Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.
Move Process and SharedMemory into the base namespace (most changes). Review URL: http://codereview.chromium.org/10895 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_dispatcher.cc')
-rw-r--r--chrome/common/resource_dispatcher.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 04693ab..d662fd9 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -334,7 +334,7 @@ void ResourceDispatcher::OnReceivedResponse(
}
void ResourceDispatcher::OnReceivedData(int request_id,
- SharedMemoryHandle shm_handle,
+ base::SharedMemoryHandle shm_handle,
int data_len) {
// Acknowlegde the reception of this data.
IPC::Message::Sender* sender = message_sender();
@@ -343,7 +343,7 @@ void ResourceDispatcher::OnReceivedData(int request_id,
new ViewHostMsg_DataReceived_ACK(MSG_ROUTING_NONE, request_id));
DCHECK((shm_handle && data_len > 0) || (!shm_handle && !data_len));
- SharedMemory shared_mem(shm_handle, true); // read only
+ base::SharedMemory shared_mem(shm_handle, true); // read only
PendingRequestList::iterator it = pending_requests_.find(request_id);
if (it == pending_requests_.end()) {