summaryrefslogtreecommitdiffstats
path: root/remoting/host/desktop_session_proxy.cc
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2015-12-22 14:49:48 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-22 22:50:51 +0000
commitc5960f3143870ec1fbb1dd7280238b324c49c694 (patch)
tree0f0acfc895b17661165ee5770c50ac006fdd33b4 /remoting/host/desktop_session_proxy.cc
parent89572b9c9defce673e0ec094b14a0bc9bbe9b8db (diff)
downloadchromium_src-c5960f3143870ec1fbb1dd7280238b324c49c694.zip
chromium_src-c5960f3143870ec1fbb1dd7280238b324c49c694.tar.gz
chromium_src-c5960f3143870ec1fbb1dd7280238b324c49c694.tar.bz2
Switch to standard integer types in remoting/host/.
BUG=138542 TBR=wez@chromium.org Review URL: https://codereview.chromium.org/1547473005 Cr-Commit-Position: refs/heads/master@{#366676}
Diffstat (limited to 'remoting/host/desktop_session_proxy.cc')
-rw-r--r--remoting/host/desktop_session_proxy.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc
index 6166d20..19b5eb9 100644
--- a/remoting/host/desktop_session_proxy.cc
+++ b/remoting/host/desktop_session_proxy.cc
@@ -4,11 +4,15 @@
#include "remoting/host/desktop_session_proxy.h"
+#include <stddef.h>
+
#include "base/compiler_specific.h"
#include "base/logging.h"
-#include "base/process/process_handle.h"
+#include "base/macros.h"
#include "base/memory/shared_memory.h"
+#include "base/process/process_handle.h"
#include "base/single_thread_task_runner.h"
+#include "build/build_config.h"
#include "ipc/ipc_channel_proxy.h"
#include "ipc/ipc_message_macros.h"
#include "remoting/base/capabilities.h"
@@ -201,7 +205,7 @@ bool DesktopSessionProxy::OnMessageReceived(const IPC::Message& message) {
return handled;
}
-void DesktopSessionProxy::OnChannelConnected(int32 peer_pid) {
+void DesktopSessionProxy::OnChannelConnected(int32_t peer_pid) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
VLOG(1) << "IPC: network <- desktop (" << peer_pid << ")";
@@ -471,7 +475,7 @@ void DesktopSessionProxy::OnAudioPacket(const std::string& serialized_packet) {
void DesktopSessionProxy::OnCreateSharedBuffer(
int id,
IPC::PlatformFileForTransit handle,
- uint32 size) {
+ uint32_t size) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
#if defined(OS_WIN)