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 "chrome/browser/nacl_host/nacl_process_host.h" | 5 #include "chrome/browser/nacl_host/nacl_process_host.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/file_util.h" |
13 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
14 #include "base/metrics/histogram.h" | 15 #include "base/metrics/histogram.h" |
15 #include "base/path_service.h" | 16 #include "base/path_service.h" |
16 #include "base/process_util.h" | 17 #include "base/process_util.h" |
17 #include "base/string_util.h" | 18 #include "base/string_util.h" |
18 #include "base/stringprintf.h" | 19 #include "base/stringprintf.h" |
19 #include "base/strings/string_number_conversions.h" | 20 #include "base/strings/string_number_conversions.h" |
20 #include "base/strings/string_split.h" | 21 #include "base/strings/string_split.h" |
21 #include "base/utf_string_conversions.h" | 22 #include "base/utf_string_conversions.h" |
22 #include "base/win/windows_version.h" | 23 #include "base/win/windows_version.h" |
(...skipping 30 matching lines...) Expand all Loading... |
53 #include "ppapi/proxy/ppapi_messages.h" | 54 #include "ppapi/proxy/ppapi_messages.h" |
54 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h" | 55 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h" |
55 | 56 |
56 #if defined(OS_POSIX) | 57 #if defined(OS_POSIX) |
57 #include <fcntl.h> | 58 #include <fcntl.h> |
58 | 59 |
59 #include "ipc/ipc_channel_posix.h" | 60 #include "ipc/ipc_channel_posix.h" |
60 #elif defined(OS_WIN) | 61 #elif defined(OS_WIN) |
61 #include <windows.h> | 62 #include <windows.h> |
62 | 63 |
63 #include "base/process_util.h" | |
64 #include "base/threading/thread.h" | 64 #include "base/threading/thread.h" |
65 #include "base/win/scoped_handle.h" | 65 #include "base/win/scoped_handle.h" |
66 #include "chrome/browser/nacl_host/nacl_broker_service_win.h" | 66 #include "chrome/browser/nacl_host/nacl_broker_service_win.h" |
67 #include "chrome/common/nacl_debug_exception_handler_win.h" | 67 #include "chrome/common/nacl_debug_exception_handler_win.h" |
68 #include "content/public/common/sandbox_init.h" | 68 #include "content/public/common/sandbox_init.h" |
69 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 69 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
70 #endif | 70 #endif |
71 | 71 |
72 using content::BrowserThread; | 72 using content::BrowserThread; |
73 using content::ChildProcessData; | 73 using content::ChildProcessData; |
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
991 } else { | 991 } else { |
992 NaClStartDebugExceptionHandlerThread( | 992 NaClStartDebugExceptionHandlerThread( |
993 process_handle.Take(), info, | 993 process_handle.Take(), info, |
994 base::MessageLoopProxy::current(), | 994 base::MessageLoopProxy::current(), |
995 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 995 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
996 weak_factory_.GetWeakPtr())); | 996 weak_factory_.GetWeakPtr())); |
997 return true; | 997 return true; |
998 } | 998 } |
999 } | 999 } |
1000 #endif | 1000 #endif |
OLD | NEW |