Chromium Code Reviews| 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 37dfb15227a90fa9bd90938d07ebd833a14502ba..fce34263fccbcbe635747d12a2d03fc91923cdf2 100644 |
| --- a/components/nacl/renderer/nexe_load_manager.h |
| +++ b/components/nacl/renderer/nexe_load_manager.h |
| @@ -16,6 +16,7 @@ |
| #include "base/memory/shared_memory.h" |
| #include "base/memory/weak_ptr.h" |
| #include "base/time/time.h" |
| +#include "components/nacl/common/nacl.mojom.h" |
| #include "components/nacl/renderer/ppb_nacl_private.h" |
| #include "url/gurl.h" |
| @@ -32,7 +33,7 @@ class TrustedPluginChannel; |
| // nexe. |
| class NexeLoadManager { |
| public: |
| - explicit NexeLoadManager(PP_Instance instance); |
| + NexeLoadManager(PP_Instance instance, mojom::NaClHost* host); |
|
tibell
2017/01/31 01:24:13
Comment: |host| must outlive this object.
Sam McNally
2017/02/07 00:13:18
Done.
|
| ~NexeLoadManager(); |
| void NexeFileDidOpen(int32_t pp_error, |
| @@ -118,8 +119,8 @@ 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; |
| + void set_crash_info_shmem_handle(mojo::ScopedSharedBufferHandle h) { |
| + crash_info_shmem_handle_ = std::move(h); |
| } |
| bool nonsfi() const { return nonsfi_; } |
| @@ -187,10 +188,13 @@ class NexeLoadManager { |
| // A flag that indicates if the plugin is using Non-SFI mode. |
| bool nonsfi_; |
| - base::SharedMemoryHandle crash_info_shmem_handle_; |
| + mojo::ScopedSharedBufferHandle crash_info_shmem_handle_; |
| std::unique_ptr<TrustedPluginChannel> trusted_plugin_channel_; |
| std::unique_ptr<ManifestServiceChannel> manifest_service_channel_; |
| + |
| + mojom::NaClHost* const host_; |
| + |
| base::WeakPtrFactory<NexeLoadManager> weak_factory_; |
| }; |