OLD | NEW |
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 <map> | 5 #include <map> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 // Need to include this before most other files because it defines | 9 // Need to include this before most other files because it defines |
10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define | 10 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define |
11 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the | 11 // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the |
12 // ViewMsgLog et al. functions. | 12 // ViewMsgLog et al. functions. |
13 | 13 |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
16 #include "base/synchronization/waitable_event.h" | 16 #include "base/synchronization/waitable_event.h" |
17 #include "base/threading/thread.h" | 17 #include "base/threading/thread.h" |
18 #include "components/tracing/child_trace_message_filter.h" | 18 #include "components/tracing/child_trace_message_filter.h" |
19 #include "ipc/ipc_channel_handle.h" | 19 #include "ipc/ipc_channel_handle.h" |
20 #include "ipc/ipc_logging.h" | 20 #include "ipc/ipc_logging.h" |
21 #include "ipc/ipc_message.h" | 21 #include "ipc/ipc_message.h" |
22 #include "native_client/src/shared/ppapi_proxy/ppruntime.h" | 22 #include "native_client/src/shared/ppapi_proxy/ppruntime.h" |
23 #include "native_client/src/shared/srpc/nacl_srpc.h" | 23 #include "native_client/src/shared/srpc/nacl_srpc.h" |
24 #include "native_client/src/untrusted/irt/irt_ppapi.h" | 24 #include "native_client/src/untrusted/irt/irt_ppapi.h" |
25 #include "ppapi/c/ppp.h" | 25 #include "ppapi/c/ppp.h" |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 | 289 |
290 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); | 290 PpapiDispatcher ppapi_dispatcher(io_thread.message_loop_proxy()); |
291 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); | 291 plugin_globals.set_plugin_proxy_delegate(&ppapi_dispatcher); |
292 | 292 |
293 loop.Run(); | 293 loop.Run(); |
294 | 294 |
295 NaClSrpcModuleFini(); | 295 NaClSrpcModuleFini(); |
296 | 296 |
297 return 0; | 297 return 0; |
298 } | 298 } |
OLD | NEW |