OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/nacl/renderer/manifest_service_channel.h" | 5 #include "components/nacl/renderer/manifest_service_channel.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "build/build_config.h" |
10 #include "content/public/common/sandbox_init.h" | 11 #include "content/public/common/sandbox_init.h" |
11 #include "content/public/renderer/render_thread.h" | 12 #include "content/public/renderer/render_thread.h" |
12 #include "ipc/ipc_channel.h" | 13 #include "ipc/ipc_channel.h" |
13 #include "ipc/ipc_sync_channel.h" | 14 #include "ipc/ipc_sync_channel.h" |
14 #include "ppapi/c/pp_errors.h" | 15 #include "ppapi/c/pp_errors.h" |
15 #include "ppapi/c/ppb_file_io.h" | 16 #include "ppapi/c/ppb_file_io.h" |
16 #include "ppapi/proxy/ppapi_messages.h" | 17 #include "ppapi/proxy/ppapi_messages.h" |
17 | 18 |
18 namespace nacl { | 19 namespace nacl { |
19 | 20 |
(...skipping 29 matching lines...) Expand all Loading... |
49 IPC_BEGIN_MESSAGE_MAP(ManifestServiceChannel, message) | 50 IPC_BEGIN_MESSAGE_MAP(ManifestServiceChannel, message) |
50 IPC_MESSAGE_HANDLER(PpapiHostMsg_StartupInitializationComplete, | 51 IPC_MESSAGE_HANDLER(PpapiHostMsg_StartupInitializationComplete, |
51 OnStartupInitializationComplete) | 52 OnStartupInitializationComplete) |
52 IPC_MESSAGE_HANDLER_DELAY_REPLY(PpapiHostMsg_OpenResource, | 53 IPC_MESSAGE_HANDLER_DELAY_REPLY(PpapiHostMsg_OpenResource, |
53 OnOpenResource) | 54 OnOpenResource) |
54 IPC_MESSAGE_UNHANDLED(handled = false) | 55 IPC_MESSAGE_UNHANDLED(handled = false) |
55 IPC_END_MESSAGE_MAP() | 56 IPC_END_MESSAGE_MAP() |
56 return handled; | 57 return handled; |
57 } | 58 } |
58 | 59 |
59 void ManifestServiceChannel::OnChannelConnected(int32 peer_pid) { | 60 void ManifestServiceChannel::OnChannelConnected(int32_t peer_pid) { |
60 peer_pid_ = peer_pid; | 61 peer_pid_ = peer_pid; |
61 if (!connected_callback_.is_null()) | 62 if (!connected_callback_.is_null()) |
62 base::ResetAndReturn(&connected_callback_).Run(PP_OK); | 63 base::ResetAndReturn(&connected_callback_).Run(PP_OK); |
63 } | 64 } |
64 | 65 |
65 void ManifestServiceChannel::OnChannelError() { | 66 void ManifestServiceChannel::OnChannelError() { |
66 if (!connected_callback_.is_null()) | 67 if (!connected_callback_.is_null()) |
67 base::ResetAndReturn(&connected_callback_).Run(PP_ERROR_FAILED); | 68 base::ResetAndReturn(&connected_callback_).Run(PP_ERROR_FAILED); |
68 } | 69 } |
69 | 70 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 #endif | 102 #endif |
102 } | 103 } |
103 PpapiHostMsg_OpenResource::WriteReplyParams(reply, | 104 PpapiHostMsg_OpenResource::WriteReplyParams(reply, |
104 handle, | 105 handle, |
105 token_lo, | 106 token_lo, |
106 token_hi); | 107 token_hi); |
107 Send(reply); | 108 Send(reply); |
108 } | 109 } |
109 | 110 |
110 } // namespace nacl | 111 } // namespace nacl |
OLD | NEW |