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

Unified Diff: chrome/browser/nacl_host/nacl_process_host.h

Issue 9950055: Enable --nacl-gdb flag on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: style nit Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
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_;
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | chrome/browser/nacl_host/nacl_process_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698