| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 5 #ifndef NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
| 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 6 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
| 7 | 7 |
| 8 #include <stdarg.h> | 8 #include <stdarg.h> |
| 9 | 9 |
| 10 #include "native_client/src/include/nacl_macros.h" | 10 #include "native_client/src/include/nacl_macros.h" |
| 11 #include "native_client/src/include/portability.h" | 11 #include "native_client/src/include/portability.h" |
| 12 #include "native_client/src/shared/srpc/nacl_srpc.h" | 12 #include "native_client/src/shared/srpc/nacl_srpc.h" |
| 13 #include "native_client/src/shared/platform/nacl_check.h" | 13 #include "native_client/src/shared/platform/nacl_check.h" |
| 14 #include "native_client/src/shared/platform/nacl_threads.h" | 14 #include "native_client/src/shared/platform/nacl_threads.h" |
| 15 #include "native_client/src/trusted/desc/nacl_desc_invalid.h" | 15 #include "native_client/src/trusted/desc/nacl_desc_invalid.h" |
| 16 #include "ppapi/c/pp_instance.h" | 16 #include "ppapi/c/pp_instance.h" |
| 17 #include "ppapi/c/ppp.h" | 17 #include "ppapi/c/ppp.h" |
| 18 #include "ppapi/c/ppp_input_event.h" |
| 18 #include "ppapi/c/ppp_instance.h" | 19 #include "ppapi/c/ppp_instance.h" |
| 19 #include "ppapi/c/ppp_messaging.h" | 20 #include "ppapi/c/ppp_messaging.h" |
| 20 | 21 |
| 21 namespace plugin { | 22 namespace plugin { |
| 22 class Plugin; | 23 class Plugin; |
| 23 } | 24 } |
| 24 | 25 |
| 25 struct PPP_InputEvent; | |
| 26 | |
| 27 namespace ppapi_proxy { | 26 namespace ppapi_proxy { |
| 28 | 27 |
| 29 class BrowserPpp { | 28 class BrowserPpp { |
| 30 public: | 29 public: |
| 31 BrowserPpp(NaClSrpcChannel* main_channel, plugin::Plugin* plugin) | 30 BrowserPpp(NaClSrpcChannel* main_channel, plugin::Plugin* plugin) |
| 32 : main_channel_(main_channel), | 31 : main_channel_(main_channel), |
| 33 is_nexe_alive_(true), | 32 is_nexe_alive_(true), |
| 34 plugin_pid_(0), | 33 plugin_pid_(0), |
| 35 plugin_(plugin), | 34 plugin_(plugin), |
| 36 ppp_instance_interface_(NULL), | 35 ppp_instance_interface_(NULL), |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 const PPP_InputEvent* ppp_input_event_interface_; | 93 const PPP_InputEvent* ppp_input_event_interface_; |
| 95 | 94 |
| 96 // The thread used to handle calls on other than the main thread. | 95 // The thread used to handle calls on other than the main thread. |
| 97 struct NaClThread upcall_thread_; | 96 struct NaClThread upcall_thread_; |
| 98 NACL_DISALLOW_COPY_AND_ASSIGN(BrowserPpp); | 97 NACL_DISALLOW_COPY_AND_ASSIGN(BrowserPpp); |
| 99 }; | 98 }; |
| 100 | 99 |
| 101 } // namespace ppapi_proxy | 100 } // namespace ppapi_proxy |
| 102 | 101 |
| 103 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ | 102 #endif // NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_H_ |
| OLD | NEW |