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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "chrome/common/chrome_constants.h" | 30 #include "chrome/common/chrome_constants.h" |
31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/common/chrome_process_type.h" | 32 #include "chrome/common/chrome_process_type.h" |
33 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
34 #include "chrome/common/chrome_version_info.h" | 34 #include "chrome/common/chrome_version_info.h" |
35 #include "chrome/common/logging_chrome.h" | 35 #include "chrome/common/logging_chrome.h" |
36 #include "chrome/common/nacl_cmd_line.h" | 36 #include "chrome/common/nacl_cmd_line.h" |
37 #include "chrome/common/nacl_host_messages.h" | 37 #include "chrome/common/nacl_host_messages.h" |
38 #include "chrome/common/nacl_messages.h" | 38 #include "chrome/common/nacl_messages.h" |
39 #include "chrome/common/render_messages.h" | 39 #include "chrome/common/render_messages.h" |
| 40 #include "components/nacl/common/nacl_switches.h" |
40 #include "content/public/browser/browser_child_process_host.h" | 41 #include "content/public/browser/browser_child_process_host.h" |
41 #include "content/public/browser/browser_ppapi_host.h" | 42 #include "content/public/browser/browser_ppapi_host.h" |
42 #include "content/public/browser/child_process_data.h" | 43 #include "content/public/browser/child_process_data.h" |
43 #include "content/public/common/child_process_host.h" | 44 #include "content/public/common/child_process_host.h" |
44 #include "content/public/common/process_type.h" | 45 #include "content/public/common/process_type.h" |
45 #include "extensions/common/constants.h" | 46 #include "extensions/common/constants.h" |
46 #include "ipc/ipc_channel.h" | 47 #include "ipc/ipc_channel.h" |
47 #include "ipc/ipc_switches.h" | 48 #include "ipc/ipc_switches.h" |
48 #include "native_client/src/shared/imc/nacl_imc_c.h" | 49 #include "native_client/src/shared/imc/nacl_imc_c.h" |
49 #include "net/base/net_util.h" | 50 #include "net/base/net_util.h" |
(...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
930 } else { | 931 } else { |
931 NaClStartDebugExceptionHandlerThread( | 932 NaClStartDebugExceptionHandlerThread( |
932 process_handle.Take(), info, | 933 process_handle.Take(), info, |
933 base::MessageLoopProxy::current(), | 934 base::MessageLoopProxy::current(), |
934 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 935 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
935 weak_factory_.GetWeakPtr())); | 936 weak_factory_.GetWeakPtr())); |
936 return true; | 937 return true; |
937 } | 938 } |
938 } | 939 } |
939 #endif | 940 #endif |
OLD | NEW |