OLD | NEW |
---|---|
1 /* -*- c++ -*- */ | 1 /* -*- c++ -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 | 7 |
8 // A class containing information regarding a socket connection to a | 8 // A class containing information regarding a socket connection to a |
9 // service runtime instance. | 9 // service runtime instance. |
10 | 10 |
11 #ifndef COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ | 11 #ifndef COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ |
12 #define COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ | 12 #define COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ |
13 | 13 |
14 #include "components/nacl/renderer/plugin/utility.h" | 14 #include "components/nacl/renderer/plugin/utility.h" |
15 #include "native_client/src/include/nacl_macros.h" | 15 #include "native_client/src/include/nacl_macros.h" |
16 #include "native_client/src/include/nacl_scoped_ptr.h" | 16 #include "native_client/src/include/nacl_scoped_ptr.h" |
17 #include "native_client/src/public/imc_types.h" | 17 #include "native_client/src/public/imc_types.h" |
18 #include "native_client/src/shared/platform/nacl_sync.h" | 18 #include "native_client/src/shared/platform/nacl_sync.h" |
19 #include "native_client/src/shared/srpc/nacl_srpc.h" | 19 #include "native_client/src/shared/srpc/nacl_srpc.h" |
20 #include "ppapi/cpp/completion_callback.h" | 20 #include "ppapi/cpp/completion_callback.h" |
21 | 21 |
22 struct NaClFileInfo; | |
Mark Seaborn
2015/02/25 20:01:24
This line is removed in tip-of-tree. Have you run
| |
23 | |
24 namespace plugin { | 22 namespace plugin { |
25 | 23 |
26 class ErrorInfo; | 24 class ErrorInfo; |
27 class Plugin; | 25 class Plugin; |
28 class SelLdrLauncherChrome; | 26 class SelLdrLauncherChrome; |
29 class SrpcClient; | 27 class SrpcClient; |
30 class ServiceRuntime; | 28 class ServiceRuntime; |
31 | 29 |
32 // Struct of params used by StartSelLdr. Use a struct so that callback | 30 // Struct of params used by StartSelLdr. Use a struct so that callback |
33 // creation templates aren't overwhelmed with too many parameters. | 31 // creation templates aren't overwhelmed with too many parameters. |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
117 bool sel_ldr_wait_timed_out_; | 115 bool sel_ldr_wait_timed_out_; |
118 bool start_nexe_done_; | 116 bool start_nexe_done_; |
119 bool nexe_started_ok_; | 117 bool nexe_started_ok_; |
120 | 118 |
121 NaClHandle bootstrap_channel_; | 119 NaClHandle bootstrap_channel_; |
122 }; | 120 }; |
123 | 121 |
124 } // namespace plugin | 122 } // namespace plugin |
125 | 123 |
126 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ | 124 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ |
OLD | NEW |