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

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: Address review comments Created 7 years, 6 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
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 15 matching lines...) Expand all
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_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"
37 #include "chrome/common/nacl_host_messages.h" 36 #include "chrome/common/nacl_host_messages.h"
38 #include "chrome/common/nacl_messages.h"
39 #include "chrome/common/render_messages.h" 37 #include "chrome/common/render_messages.h"
38 #include "components/nacl/common/nacl_cmd_line.h"
39 #include "components/nacl/common/nacl_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"
50 #include "net/socket/tcp_listen_socket.h" 51 #include "net/socket/tcp_listen_socket.h"
51 #include "ppapi/host/ppapi_host.h" 52 #include "ppapi/host/ppapi_host.h"
52 #include "ppapi/proxy/ppapi_messages.h" 53 #include "ppapi/proxy/ppapi_messages.h"
53 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h" 54 #include "ppapi/shared_impl/ppapi_nacl_channel_args.h"
54 55
55 #if defined(OS_POSIX) 56 #if defined(OS_POSIX)
56 #include <fcntl.h> 57 #include <fcntl.h>
57 58
58 #include "ipc/ipc_channel_posix.h" 59 #include "ipc/ipc_channel_posix.h"
59 #elif defined(OS_WIN) 60 #elif defined(OS_WIN)
60 #include <windows.h> 61 #include <windows.h>
61 62
62 #include "base/threading/thread.h" 63 #include "base/threading/thread.h"
63 #include "base/win/scoped_handle.h" 64 #include "base/win/scoped_handle.h"
64 #include "chrome/browser/nacl_host/nacl_broker_service_win.h" 65 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
65 #include "chrome/common/nacl_debug_exception_handler_win.h" 66 #include "components/nacl/common/nacl_debug_exception_handler_win.h"
66 #include "content/public/common/sandbox_init.h" 67 #include "content/public/common/sandbox_init.h"
67 #include "content/public/common/sandboxed_process_launcher_delegate.h" 68 #include "content/public/common/sandboxed_process_launcher_delegate.h"
68 #endif 69 #endif
69 70
70 using content::BrowserThread; 71 using content::BrowserThread;
71 using content::ChildProcessData; 72 using content::ChildProcessData;
72 using content::ChildProcessHost; 73 using content::ChildProcessHost;
73 using ppapi::proxy::SerializedHandle; 74 using ppapi::proxy::SerializedHandle;
74 75
75 namespace { 76 namespace {
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698