| Index: components/nacl/loader/nacl_listener.h
|
| diff --git a/components/nacl/loader/nacl_listener.h b/components/nacl/loader/nacl_listener.h
|
| index df8b04ecaeb0a9eb69bd008566888ca0002f63ae..3a004336b36b69b1947e92453a635a538ac7aa23 100644
|
| --- a/components/nacl/loader/nacl_listener.h
|
| +++ b/components/nacl/loader/nacl_listener.h
|
| @@ -18,6 +18,9 @@ class SyncChannel;
|
| class SyncMessageFilter;
|
| }
|
|
|
| +struct NaClApp;
|
| +class NaClTrustedListener;
|
| +
|
| // The NaClListener is an IPC channel listener that waits for a
|
| // request to start a NaCl module.
|
| class NaClListener : public IPC::Listener {
|
| @@ -41,9 +44,11 @@ class NaClListener : public IPC::Listener {
|
| #endif
|
|
|
| private:
|
| - void OnStart(const nacl::NaClStartParams& params);
|
| virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
|
|
| + void OnStart(const nacl::NaClStartParams& params);
|
| + void CreateTrustedPluginChannel(struct NaClApp* nap, int irt_fd);
|
| +
|
| // A channel back to the browser.
|
| scoped_ptr<IPC::SyncChannel> channel_;
|
|
|
| @@ -52,6 +57,7 @@ class NaClListener : public IPC::Listener {
|
|
|
| base::WaitableEvent shutdown_event_;
|
| base::Thread io_thread_;
|
| + base::Thread chrome_main_thread_;
|
|
|
| #if defined(OS_LINUX)
|
| size_t prereserved_sandbox_size_;
|
| @@ -68,6 +74,8 @@ class NaClListener : public IPC::Listener {
|
| // Used to identify what thread we're on.
|
| base::MessageLoop* main_loop_;
|
|
|
| + scoped_refptr<NaClTrustedListener> trusted_listener_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NaClListener);
|
| };
|
|
|
|
|