| 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 "components/nacl/browser/nacl_process_host.h" | 5 #include "components/nacl/browser/nacl_process_host.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 #include "content/public/browser/child_process_data.h" | 39 #include "content/public/browser/child_process_data.h" |
| 40 #include "content/public/browser/plugin_service.h" | 40 #include "content/public/browser/plugin_service.h" |
| 41 #include "content/public/browser/render_process_host.h" | 41 #include "content/public/browser/render_process_host.h" |
| 42 #include "content/public/browser/web_contents.h" | 42 #include "content/public/browser/web_contents.h" |
| 43 #include "content/public/common/child_process_host.h" | 43 #include "content/public/common/child_process_host.h" |
| 44 #include "content/public/common/content_switches.h" | 44 #include "content/public/common/content_switches.h" |
| 45 #include "content/public/common/process_type.h" | 45 #include "content/public/common/process_type.h" |
| 46 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 46 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
| 47 #include "ipc/ipc_channel.h" | 47 #include "ipc/ipc_channel.h" |
| 48 #include "ipc/ipc_switches.h" | 48 #include "ipc/ipc_switches.h" |
| 49 #include "native_client/src/public/nacl_file_info.h" | |
| 50 #include "native_client/src/shared/imc/nacl_imc_c.h" | 49 #include "native_client/src/shared/imc/nacl_imc_c.h" |
| 51 #include "net/base/net_util.h" | 50 #include "net/base/net_util.h" |
| 52 #include "net/socket/tcp_listen_socket.h" | 51 #include "net/socket/tcp_listen_socket.h" |
| 53 #include "ppapi/host/host_factory.h" | 52 #include "ppapi/host/host_factory.h" |
| 54 #include "ppapi/host/ppapi_host.h" | 53 #include "ppapi/host/ppapi_host.h" |
| 55 #include "ppapi/proxy/ppapi_messages.h" | 54 #include "ppapi/proxy/ppapi_messages.h" |
| 56 #include "ppapi/shared_impl/ppapi_constants.h" | 55 #include "ppapi/shared_impl/ppapi_constants.h" |
| 57 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" | 56 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" |
| 58 | 57 |
| 59 #if defined(OS_POSIX) | 58 #if defined(OS_POSIX) |
| (...skipping 1120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1180 process.Pass(), info, | 1179 process.Pass(), info, |
| 1181 base::MessageLoopProxy::current(), | 1180 base::MessageLoopProxy::current(), |
| 1182 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1181 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 1183 weak_factory_.GetWeakPtr())); | 1182 weak_factory_.GetWeakPtr())); |
| 1184 return true; | 1183 return true; |
| 1185 } | 1184 } |
| 1186 } | 1185 } |
| 1187 #endif | 1186 #endif |
| 1188 | 1187 |
| 1189 } // namespace nacl | 1188 } // namespace nacl |
| OLD | NEW |