| Index: components/nacl/renderer/nexe_load_manager.h
|
| diff --git a/components/nacl/renderer/nexe_load_manager.h b/components/nacl/renderer/nexe_load_manager.h
|
| index 9ecbe6710c80cd06b1785cdb05bf832c742ee636..2c3b4a94670ab26ecf55dde99222d88c5515e811 100644
|
| --- a/components/nacl/renderer/nexe_load_manager.h
|
| +++ b/components/nacl/renderer/nexe_load_manager.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/files/file.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/shared_memory.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| #include "ppapi/c/private/ppb_nacl_private.h"
|
| @@ -53,7 +54,7 @@ class NexeLoadManager {
|
| const std::string& error_message,
|
| const std::string& console_message);
|
| void ReportLoadAbort();
|
| - void NexeDidCrash(const char* crash_log);
|
| + void NexeDidCrash();
|
|
|
| // TODO(dmichael): Everything below this comment should eventually be made
|
| // private, when ppb_nacl_private_impl.cc is no longer using them directly.
|
| @@ -112,6 +113,10 @@ class NexeLoadManager {
|
|
|
| const std::string& program_url() const { return program_url_; }
|
|
|
| + void set_crash_info_shmem_handle(base::SharedMemoryHandle h) {
|
| + crash_info_shmem_handle_ = h;
|
| + }
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(NexeLoadManager);
|
|
|
| @@ -171,6 +176,8 @@ class NexeLoadManager {
|
|
|
| base::Time pnacl_start_time_;
|
|
|
| + base::SharedMemoryHandle crash_info_shmem_handle_;
|
| +
|
| scoped_ptr<TrustedPluginChannel> trusted_plugin_channel_;
|
| scoped_ptr<ManifestServiceChannel> manifest_service_channel_;
|
| base::WeakPtrFactory<NexeLoadManager> weak_factory_;
|
|
|