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

Unified Diff: components/nacl/loader/nacl_ipc_adapter.cc

Issue 1548113002: Switch to standard integer types in components/, part 2 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/loader/nacl_ipc_adapter.h ('k') | components/nacl/loader/nacl_ipc_adapter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_ipc_adapter.cc
diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
index b7d12cc13b80fb8fadfb239b75eed75877606967..14db5f9b17baa0e063edbf09bed053b5b3f156e8 100644
--- a/components/nacl/loader/nacl_ipc_adapter.cc
+++ b/components/nacl/loader/nacl_ipc_adapter.cc
@@ -7,9 +7,9 @@
#include <limits.h>
#include <string.h>
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/location.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "base/task_runner_util.h"
@@ -47,7 +47,7 @@ BufferSizeStatus GetBufferStatus(const char* data, size_t len) {
const NaClIPCAdapter::NaClMessageHeader* header =
reinterpret_cast<const NaClIPCAdapter::NaClMessageHeader*>(data);
- uint32 message_size =
+ uint32_t message_size =
sizeof(NaClIPCAdapter::NaClMessageHeader) + header->payload_size;
if (len == message_size)
@@ -696,8 +696,7 @@ void NaClIPCAdapter::SaveOpenResourceMessage(
}
}
-void NaClIPCAdapter::OnChannelConnected(int32 peer_pid) {
-}
+void NaClIPCAdapter::OnChannelConnected(int32_t peer_pid) {}
void NaClIPCAdapter::OnChannelError() {
CloseChannel();
@@ -834,11 +833,11 @@ void NaClIPCAdapter::SaveMessage(const IPC::Message& msg,
NaClMessageHeader header;
memset(&header, 0, sizeof(NaClMessageHeader));
- header.payload_size = static_cast<uint32>(msg.payload_size());
+ header.payload_size = static_cast<uint32_t>(msg.payload_size());
header.routing = msg.routing_id();
header.type = msg.type();
header.flags = msg.flags();
- header.num_fds = static_cast<uint16>(rewritten_msg->desc_count());
+ header.num_fds = static_cast<uint16_t>(rewritten_msg->desc_count());
rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
locked_data_.to_be_received_.push(rewritten_msg);
« no previous file with comments | « components/nacl/loader/nacl_ipc_adapter.h ('k') | components/nacl/loader/nacl_ipc_adapter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698