| 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 NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 5 #ifndef COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_COORDINATOR_H_ |
| 6 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 6 #define COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_COORDINATOR_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "components/nacl/renderer/plugin/nacl_subprocess.h" |
| 11 #include "components/nacl/renderer/plugin/plugin_error.h" |
| 12 #include "components/nacl/renderer/plugin/pnacl_resources.h" |
| 10 #include "native_client/src/include/nacl_macros.h" | 13 #include "native_client/src/include/nacl_macros.h" |
| 11 #include "native_client/src/shared/platform/nacl_sync_raii.h" | 14 #include "native_client/src/shared/platform/nacl_sync_raii.h" |
| 12 #include "native_client/src/shared/srpc/nacl_srpc.h" | 15 #include "native_client/src/shared/srpc/nacl_srpc.h" |
| 13 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 16 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
| 14 | |
| 15 #include "ppapi/cpp/completion_callback.h" | 17 #include "ppapi/cpp/completion_callback.h" |
| 16 | |
| 17 #include "ppapi/native_client/src/trusted/plugin/nacl_subprocess.h" | |
| 18 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h" | |
| 19 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" | |
| 20 | |
| 21 #include "ppapi/utility/completion_callback_factory.h" | 18 #include "ppapi/utility/completion_callback_factory.h" |
| 22 | 19 |
| 23 struct PP_PNaClOptions; | 20 struct PP_PNaClOptions; |
| 24 | 21 |
| 25 namespace plugin { | 22 namespace plugin { |
| 26 | 23 |
| 27 class Plugin; | 24 class Plugin; |
| 28 class PnaclCoordinator; | 25 class PnaclCoordinator; |
| 29 class PnaclTranslateThread; | 26 class PnaclTranslateThread; |
| 30 class TempFile; | 27 class TempFile; |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 | 181 |
| 185 // The helper thread used to do translations via SRPC. | 182 // The helper thread used to do translations via SRPC. |
| 186 // It accesses fields of PnaclCoordinator so it must have a | 183 // It accesses fields of PnaclCoordinator so it must have a |
| 187 // shorter lifetime. | 184 // shorter lifetime. |
| 188 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; | 185 nacl::scoped_ptr<PnaclTranslateThread> translate_thread_; |
| 189 }; | 186 }; |
| 190 | 187 |
| 191 //---------------------------------------------------------------------- | 188 //---------------------------------------------------------------------- |
| 192 | 189 |
| 193 } // namespace plugin; | 190 } // namespace plugin; |
| 194 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_COORDINATOR_H_ | 191 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_COORDINATOR_H_ |
| OLD | NEW |