Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / components / nacl / loader / nacl_listener.h

diff --git a/src/components/nacl/loader/nacl_listener.h b/src/components/nacl/loader/nacl_listener.h
index df8b04e..f216d92 100644 (file)
--- a/src/components/nacl/loader/nacl_listener.h
+++ b/src/components/nacl/loader/nacl_listener.h
@@ -11,6 +11,7 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "components/nacl/common/nacl_types.h"
+#include "components/nacl/loader/nacl_trusted_listener.h"
 #include "ipc/ipc_listener.h"
 
 namespace IPC {
@@ -29,6 +30,9 @@ class NaClListener : public IPC::Listener {
 
   bool Send(IPC::Message* msg);
 
+  void set_uses_nonsfi_mode(bool uses_nonsfi_mode) {
+    uses_nonsfi_mode_ = uses_nonsfi_mode;
+  }
 #if defined(OS_LINUX)
   void set_prereserved_sandbox_size(size_t prereserved_sandbox_size) {
     prereserved_sandbox_size_ = prereserved_sandbox_size;
@@ -53,6 +57,7 @@ class NaClListener : public IPC::Listener {
   base::WaitableEvent shutdown_event_;
   base::Thread io_thread_;
 
+  bool uses_nonsfi_mode_;
 #if defined(OS_LINUX)
   size_t prereserved_sandbox_size_;
 #endif
@@ -65,6 +70,8 @@ class NaClListener : public IPC::Listener {
   int number_of_cores_;
 #endif
 
+  scoped_refptr<NaClTrustedListener> trusted_listener_;
+
   // Used to identify what thread we're on.
   base::MessageLoop* main_loop_;