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 <string.h> | 7 #include <string.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "base/single_thread_task_runner.h" | 25 #include "base/single_thread_task_runner.h" |
26 #include "base/stl_util.h" | 26 #include "base/stl_util.h" |
27 #include "base/strings/string_number_conversions.h" | 27 #include "base/strings/string_number_conversions.h" |
28 #include "base/strings/string_split.h" | 28 #include "base/strings/string_split.h" |
29 #include "base/strings/string_util.h" | 29 #include "base/strings/string_util.h" |
30 #include "base/strings/stringprintf.h" | 30 #include "base/strings/stringprintf.h" |
31 #include "base/strings/utf_string_conversions.h" | 31 #include "base/strings/utf_string_conversions.h" |
32 #include "base/sys_byteorder.h" | 32 #include "base/sys_byteorder.h" |
33 #include "base/threading/sequenced_worker_pool.h" | 33 #include "base/threading/sequenced_worker_pool.h" |
34 #include "base/threading/thread_task_runner_handle.h" | 34 #include "base/threading/thread_task_runner_handle.h" |
35 #include "base/win/windows_version.h" | |
36 #include "build/build_config.h" | 35 #include "build/build_config.h" |
37 #include "components/nacl/browser/nacl_browser.h" | 36 #include "components/nacl/browser/nacl_browser.h" |
38 #include "components/nacl/browser/nacl_browser_delegate.h" | 37 #include "components/nacl/browser/nacl_browser_delegate.h" |
39 #include "components/nacl/browser/nacl_host_message_filter.h" | 38 #include "components/nacl/browser/nacl_host_message_filter.h" |
40 #include "components/nacl/common/nacl_cmd_line.h" | 39 #include "components/nacl/common/nacl_cmd_line.h" |
41 #include "components/nacl/common/nacl_constants.h" | 40 #include "components/nacl/common/nacl_constants.h" |
42 #include "components/nacl/common/nacl_host_messages.h" | 41 #include "components/nacl/common/nacl_host_messages.h" |
43 #include "components/nacl/common/nacl_messages.h" | 42 #include "components/nacl/common/nacl_messages.h" |
44 #include "components/nacl/common/nacl_process_type.h" | 43 #include "components/nacl/common/nacl_process_type.h" |
45 #include "components/nacl/common/nacl_switches.h" | 44 #include "components/nacl/common/nacl_switches.h" |
(...skipping 25 matching lines...) Expand all Loading... |
71 #include <netinet/in.h> | 70 #include <netinet/in.h> |
72 #include <sys/socket.h> | 71 #include <sys/socket.h> |
73 | 72 |
74 #include "content/public/browser/zygote_handle_linux.h" | 73 #include "content/public/browser/zygote_handle_linux.h" |
75 #elif defined(OS_WIN) | 74 #elif defined(OS_WIN) |
76 #include <windows.h> | 75 #include <windows.h> |
77 #include <winsock2.h> | 76 #include <winsock2.h> |
78 | 77 |
79 #include "base/threading/thread.h" | 78 #include "base/threading/thread.h" |
80 #include "base/win/scoped_handle.h" | 79 #include "base/win/scoped_handle.h" |
| 80 #include "base/win/windows_version.h" |
81 #include "components/nacl/browser/nacl_broker_service_win.h" | 81 #include "components/nacl/browser/nacl_broker_service_win.h" |
82 #include "components/nacl/common/nacl_debug_exception_handler_win.h" | 82 #include "components/nacl/common/nacl_debug_exception_handler_win.h" |
83 #include "content/public/common/sandbox_init.h" | 83 #include "content/public/common/sandbox_init.h" |
84 #endif | 84 #endif |
85 | 85 |
86 using content::BrowserThread; | 86 using content::BrowserThread; |
87 using content::ChildProcessData; | 87 using content::ChildProcessData; |
88 using content::ChildProcessHost; | 88 using content::ChildProcessHost; |
89 using ppapi::proxy::SerializedHandle; | 89 using ppapi::proxy::SerializedHandle; |
90 | 90 |
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1165 NaClStartDebugExceptionHandlerThread( | 1165 NaClStartDebugExceptionHandlerThread( |
1166 std::move(process), info, base::ThreadTaskRunnerHandle::Get(), | 1166 std::move(process), info, base::ThreadTaskRunnerHandle::Get(), |
1167 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1167 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
1168 weak_factory_.GetWeakPtr())); | 1168 weak_factory_.GetWeakPtr())); |
1169 return true; | 1169 return true; |
1170 } | 1170 } |
1171 } | 1171 } |
1172 #endif | 1172 #endif |
1173 | 1173 |
1174 } // namespace nacl | 1174 } // namespace nacl |
OLD | NEW |