OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_NACL_NACL_LISTENER_H_ | 5 #ifndef CHROME_NACL_NACL_LISTENER_H_ |
6 #define CHROME_NACL_NACL_LISTENER_H_ | 6 #define CHROME_NACL_NACL_LISTENER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/synchronization/waitable_event.h" | 12 #include "base/synchronization/waitable_event.h" |
13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
14 #include "chrome/common/nacl_types.h" | 14 #include "chrome/common/nacl_types.h" |
| 15 #include "chrome/nacl/nacl_ipc_manager.h" |
15 #include "ipc/ipc_channel.h" | 16 #include "ipc/ipc_channel.h" |
16 | 17 |
17 namespace IPC { | 18 namespace IPC { |
18 class SyncChannel; | 19 class SyncChannel; |
19 class SyncMessageFilter; | 20 class SyncMessageFilter; |
20 } | 21 } |
21 | 22 |
22 // The NaClListener is an IPC channel listener that waits for a | 23 // The NaClListener is an IPC channel listener that waits for a |
23 // request to start a NaCl module. | 24 // request to start a NaCl module. |
24 class NaClListener : public IPC::Channel::Listener { | 25 class NaClListener : public IPC::Channel::Listener { |
(...skipping 15 matching lines...) Expand all Loading... |
40 | 41 |
41 // A filter that allows other threads to use the channel. | 42 // A filter that allows other threads to use the channel. |
42 scoped_refptr<IPC::SyncMessageFilter> filter_; | 43 scoped_refptr<IPC::SyncMessageFilter> filter_; |
43 | 44 |
44 base::WaitableEvent shutdown_event_; | 45 base::WaitableEvent shutdown_event_; |
45 base::Thread io_thread_; | 46 base::Thread io_thread_; |
46 | 47 |
47 // Used to identify what thread we're on. | 48 // Used to identify what thread we're on. |
48 MessageLoop* main_loop_; | 49 MessageLoop* main_loop_; |
49 | 50 |
| 51 NaClIPCManager nacl_ipc_manager_; |
| 52 void* nacl_ppapi_channel_; |
| 53 |
50 bool debug_enabled_; | 54 bool debug_enabled_; |
51 | 55 |
52 DISALLOW_COPY_AND_ASSIGN(NaClListener); | 56 DISALLOW_COPY_AND_ASSIGN(NaClListener); |
53 }; | 57 }; |
54 | 58 |
55 #endif // CHROME_NACL_NACL_LISTENER_H_ | 59 #endif // CHROME_NACL_NACL_LISTENER_H_ |
OLD | NEW |