Chromium Code Reviews| Index: chrome/browser/nacl_host/nacl_process_host.h |
| =================================================================== |
| --- chrome/browser/nacl_host/nacl_process_host.h (revision 130109) |
| +++ chrome/browser/nacl_host/nacl_process_host.h (working copy) |
| @@ -12,6 +12,7 @@ |
| #include "base/file_util_proxy.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/weak_ptr.h" |
| +#include "base/message_loop.h" |
| #include "base/process.h" |
| #include "chrome/common/nacl_types.h" |
| #include "content/public/browser/browser_child_process_host_delegate.h" |
| @@ -61,10 +62,17 @@ |
| // depends on chrome.gyp (circular dependency). |
| struct NaClInternal; |
| +#if defined(OS_WIN) |
| // Create command line for launching loader under nacl-gdb. |
| scoped_ptr<CommandLine> LaunchWithNaClGdb(const FilePath& nacl_gdb, |
| - CommandLine* line, |
| - const FilePath& manifest_path); |
| + CommandLine* line); |
| +#endif |
| +#if defined(OS_LINUX) |
|
Mark Seaborn
2012/04/03 21:57:44
Use #elif, since this is the Linux version of the
halyavin
2012/04/04 09:23:15
Done.
|
| + bool LaunchNaClGdb(base::ProcessId pid); |
| + void OnNaClGdbAttached(); |
| +#endif |
| + // Get path to manifest on local disk if possible. |
| + FilePath GetManifestPath(); |
| bool LaunchSelLdr(); |
| // BrowserChildProcessHostDelegate implementation: |
| @@ -88,6 +96,11 @@ |
| // the NaCl loader. |
| bool process_launched_by_broker_; |
| #endif |
| +#if defined(OS_LINUX) |
|
Mark Seaborn
2012/04/03 21:57:44
It'd be neater to use #elif here too.
halyavin
2012/04/04 09:23:15
Done.
|
| + bool wait_for_nacl_gdb_; |
| + MessageLoopForIO::FileDescriptorWatcher nacl_gdb_watcher_; |
| + scoped_ptr<MessageLoopForIO::Watcher> nacl_gdb_watcher_delegate_; |
| +#endif |
| // The ChromeRenderMessageFilter that requested this NaCl process. We use |
| // this for sending the reply once the process has started. |
| scoped_refptr<ChromeRenderMessageFilter> chrome_render_message_filter_; |