Chromium Code Reviews| 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 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ | 5 #ifndef CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ |
| 6 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ | 6 #define CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| 11 #include "base/file_util_proxy.h" | 11 #include "base/file_util_proxy.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
| 15 #include "base/process.h" | 15 #include "base/process.h" |
| 16 #include "chrome/common/nacl_types.h" | 16 #include "chrome/common/nacl_types.h" |
| 17 #include "content/public/browser/browser_child_process_host_delegate.h" | 17 #include "content/public/browser/browser_child_process_host_delegate.h" |
| 18 #include "googleurl/src/gurl.h" | 18 #include "googleurl/src/gurl.h" |
| 19 #include "ipc/ipc_channel_handle.h" | 19 #include "ipc/ipc_channel_handle.h" |
| 20 #include "net/base/tcp_listen_socket.h" | |
|
szym
2012/09/11 16:17:24
Don't include this. Instead, forward-declare Socke
halyavin
2012/09/12 14:29:58
SocketDescriptor is not a struct or a class, it ca
| |
| 20 | 21 |
| 21 class ChromeRenderMessageFilter; | 22 class ChromeRenderMessageFilter; |
| 22 class CommandLine; | 23 class CommandLine; |
| 23 class ExtensionInfoMap; | 24 class ExtensionInfoMap; |
| 24 | 25 |
| 25 namespace content { | 26 namespace content { |
| 26 class BrowserChildProcessHost; | 27 class BrowserChildProcessHost; |
| 27 } | 28 } |
| 28 | 29 |
| 29 namespace IPC { | 30 namespace IPC { |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 }; | 85 }; |
| 85 | 86 |
| 86 #if defined(OS_WIN) | 87 #if defined(OS_WIN) |
| 87 // Create command line for launching loader under nacl-gdb. | 88 // Create command line for launching loader under nacl-gdb. |
| 88 scoped_ptr<CommandLine> GetCommandForLaunchWithGdb(const FilePath& nacl_gdb, | 89 scoped_ptr<CommandLine> GetCommandForLaunchWithGdb(const FilePath& nacl_gdb, |
| 89 CommandLine* line); | 90 CommandLine* line); |
| 90 #elif defined(OS_LINUX) | 91 #elif defined(OS_LINUX) |
| 91 bool LaunchNaClGdb(base::ProcessId pid); | 92 bool LaunchNaClGdb(base::ProcessId pid); |
| 92 void OnNaClGdbAttached(); | 93 void OnNaClGdbAttached(); |
| 93 #endif | 94 #endif |
| 95 #if defined(OS_POSIX) | |
| 96 // Create bound TCP socket in the browser process so that the NaCl GDB debug | |
| 97 // stub can use it to accept incoming connections even when the Chrome sandbox | |
| 98 // is enabled. | |
| 99 SocketDescriptor GetDebugStubSocketHandle(); | |
| 100 #endif | |
| 94 // Get path to manifest on local disk if possible. | 101 // Get path to manifest on local disk if possible. |
| 95 FilePath GetManifestPath(); | 102 FilePath GetManifestPath(); |
| 96 bool LaunchSelLdr(); | 103 bool LaunchSelLdr(); |
| 97 | 104 |
| 98 // BrowserChildProcessHostDelegate implementation: | 105 // BrowserChildProcessHostDelegate implementation: |
| 99 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; | 106 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; |
| 100 virtual void OnProcessLaunched() OVERRIDE; | 107 virtual void OnProcessLaunched() OVERRIDE; |
| 101 | 108 |
| 102 void OnResourcesReady(); | 109 void OnResourcesReady(); |
| 103 | 110 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 | 189 |
| 183 // Channel proxy to terminate the NaCl-Browser PPAPI channel. | 190 // Channel proxy to terminate the NaCl-Browser PPAPI channel. |
| 184 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_; | 191 scoped_ptr<IPC::ChannelProxy> ipc_proxy_channel_; |
| 185 // Plugin listener, to forward browser channel messages to us. | 192 // Plugin listener, to forward browser channel messages to us. |
| 186 PluginListener ipc_plugin_listener_; | 193 PluginListener ipc_plugin_listener_; |
| 187 | 194 |
| 188 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); | 195 DISALLOW_COPY_AND_ASSIGN(NaClProcessHost); |
| 189 }; | 196 }; |
| 190 | 197 |
| 191 #endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ | 198 #endif // CHROME_BROWSER_NACL_HOST_NACL_PROCESS_HOST_H_ |
| OLD | NEW |