Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create a zygote folder Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 14 matching lines...) Expand all
25 #include "build/build_config.h" 25 #include "build/build_config.h"
26 #include "chrome/browser/extensions/extension_info_map.h" 26 #include "chrome/browser/extensions/extension_info_map.h"
27 #include "chrome/browser/nacl_host/nacl_browser.h" 27 #include "chrome/browser/nacl_host/nacl_browser.h"
28 #include "chrome/browser/nacl_host/nacl_host_message_filter.h" 28 #include "chrome/browser/nacl_host/nacl_host_message_filter.h"
29 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 29 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/chrome_process_type.h" 31 #include "chrome/common/chrome_process_type.h"
32 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
33 #include "chrome/common/chrome_version_info.h" 33 #include "chrome/common/chrome_version_info.h"
34 #include "chrome/common/logging_chrome.h" 34 #include "chrome/common/logging_chrome.h"
35 #include "chrome/common/nacl_cmd_line.h"
36 #include "chrome/common/nacl_host_messages.h" 35 #include "chrome/common/nacl_host_messages.h"
37 #include "chrome/common/nacl_messages.h"
38 #include "chrome/common/render_messages.h" 36 #include "chrome/common/render_messages.h"
37 #include "components/nacl/common/nacl_cmd_line.h"
38 #include "components/nacl/common/nacl_messages.h"
39 #include "components/nacl/common/nacl_switches.h" 39 #include "components/nacl/common/nacl_switches.h"
40 #include "content/public/browser/browser_child_process_host.h" 40 #include "content/public/browser/browser_child_process_host.h"
41 #include "content/public/browser/browser_ppapi_host.h" 41 #include "content/public/browser/browser_ppapi_host.h"
42 #include "content/public/browser/child_process_data.h" 42 #include "content/public/browser/child_process_data.h"
43 #include "content/public/common/child_process_host.h" 43 #include "content/public/common/child_process_host.h"
44 #include "content/public/common/process_type.h" 44 #include "content/public/common/process_type.h"
45 #include "extensions/common/constants.h" 45 #include "extensions/common/constants.h"
46 #include "ipc/ipc_channel.h" 46 #include "ipc/ipc_channel.h"
47 #include "ipc/ipc_switches.h" 47 #include "ipc/ipc_switches.h"
48 #include "native_client/src/shared/imc/nacl_imc_c.h" 48 #include "native_client/src/shared/imc/nacl_imc_c.h"
49 #include "net/base/net_util.h" 49 #include "net/base/net_util.h"
50 #include "net/socket/tcp_listen_socket.h" 50 #include "net/socket/tcp_listen_socket.h"
51 #include "ppapi/host/ppapi_host.h" 51 #include "ppapi/host/ppapi_host.h"
52 #include "ppapi/proxy/ppapi_messages.h" 52 #include "ppapi/proxy/ppapi_messages.h"
53 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h" 53 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
54 54
55 #if defined(OS_POSIX) 55 #if defined(OS_POSIX)
56 #include <fcntl.h> 56 #include <fcntl.h>
57 57
58 #include "ipc/ipc_channel_posix.h" 58 #include "ipc/ipc_channel_posix.h"
59 #elif defined(OS_WIN) 59 #elif defined(OS_WIN)
60 #include <windows.h> 60 #include <windows.h>
61 61
62 #include "base/threading/thread.h" 62 #include "base/threading/thread.h"
63 #include "base/win/scoped_handle.h" 63 #include "base/win/scoped_handle.h"
64 #include "chrome/browser/nacl_host/nacl_broker_service_win.h" 64 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
65 #include "chrome/common/nacl_debug_exception_handler_win.h" 65 #include "components/nacl/common/nacl_debug_exception_handler_win.h"
66 #include "content/public/common/sandbox_init.h" 66 #include "content/public/common/sandbox_init.h"
67 #include "content/public/common/sandboxed_process_launcher_delegate.h" 67 #include "content/public/common/sandboxed_process_launcher_delegate.h"
68 #endif 68 #endif
69 69
70 using content::BrowserThread; 70 using content::BrowserThread;
71 using content::ChildProcessData; 71 using content::ChildProcessData;
72 using content::ChildProcessHost; 72 using content::ChildProcessHost;
73 using ppapi::proxy::SerializedHandle; 73 using ppapi::proxy::SerializedHandle;
74 74
75 namespace { 75 namespace {
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 } else { 927 } else {
928 NaClStartDebugExceptionHandlerThread( 928 NaClStartDebugExceptionHandlerThread(
929 process_handle.Take(), info, 929 process_handle.Take(), info,
930 base::MessageLoopProxy::current(), 930 base::MessageLoopProxy::current(),
931 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 931 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
932 weak_factory_.GetWeakPtr())); 932 weak_factory_.GetWeakPtr()));
933 return true; 933 return true;
934 } 934 }
935 } 935 }
936 #endif 936 #endif
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698