| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 #include "native_client/src/shared/imc/nacl_imc_c.h" | 53 #include "native_client/src/shared/imc/nacl_imc_c.h" |
| 54 #include "net/socket/socket_descriptor.h" | 54 #include "net/socket/socket_descriptor.h" |
| 55 #include "ppapi/host/host_factory.h" | 55 #include "ppapi/host/host_factory.h" |
| 56 #include "ppapi/host/ppapi_host.h" | 56 #include "ppapi/host/ppapi_host.h" |
| 57 #include "ppapi/proxy/ppapi_messages.h" | 57 #include "ppapi/proxy/ppapi_messages.h" |
| 58 #include "ppapi/shared_impl/ppapi_constants.h" | 58 #include "ppapi/shared_impl/ppapi_constants.h" |
| 59 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" | 59 #include "ppapi/shared_impl/ppapi_nacl_plugin_args.h" |
| 60 | 60 |
| 61 #if defined(OS_POSIX) | 61 #if defined(OS_POSIX) |
| 62 | 62 |
| 63 #include <arpa/inet.h> |
| 63 #include <fcntl.h> | 64 #include <fcntl.h> |
| 64 #include <netinet/in.h> | 65 #include <netinet/in.h> |
| 65 #include <sys/socket.h> | 66 #include <sys/socket.h> |
| 66 | 67 |
| 67 #include "ipc/ipc_channel_posix.h" | 68 #include "ipc/ipc_channel_posix.h" |
| 68 #elif defined(OS_WIN) | 69 #elif defined(OS_WIN) |
| 69 #include <windows.h> | 70 #include <windows.h> |
| 71 #include <winsock2.h> |
| 70 | 72 |
| 71 #include "base/threading/thread.h" | 73 #include "base/threading/thread.h" |
| 72 #include "base/win/scoped_handle.h" | 74 #include "base/win/scoped_handle.h" |
| 73 #include "components/nacl/browser/nacl_broker_service_win.h" | 75 #include "components/nacl/browser/nacl_broker_service_win.h" |
| 74 #include "components/nacl/common/nacl_debug_exception_handler_win.h" | 76 #include "components/nacl/common/nacl_debug_exception_handler_win.h" |
| 75 #include "content/public/common/sandbox_init.h" | 77 #include "content/public/common/sandbox_init.h" |
| 76 #endif | 78 #endif |
| 77 | 79 |
| 78 using content::BrowserThread; | 80 using content::BrowserThread; |
| 79 using content::ChildProcessData; | 81 using content::ChildProcessData; |
| (...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1394 NaClStartDebugExceptionHandlerThread( | 1396 NaClStartDebugExceptionHandlerThread( |
| 1395 process.Pass(), info, base::ThreadTaskRunnerHandle::Get(), | 1397 process.Pass(), info, base::ThreadTaskRunnerHandle::Get(), |
| 1396 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1398 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
| 1397 weak_factory_.GetWeakPtr())); | 1399 weak_factory_.GetWeakPtr())); |
| 1398 return true; | 1400 return true; |
| 1399 } | 1401 } |
| 1400 } | 1402 } |
| 1401 #endif | 1403 #endif |
| 1402 | 1404 |
| 1403 } // namespace nacl | 1405 } // namespace nacl |
| OLD | NEW |