| 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 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 : url(url), | 33 : url(url), |
| 34 file_info(file_info), | 34 file_info(file_info), |
| 35 process_type(process_type) { | 35 process_type(process_type) { |
| 36 } | 36 } |
| 37 std::string url; | 37 std::string url; |
| 38 PP_NaClFileInfo file_info; | 38 PP_NaClFileInfo file_info; |
| 39 PP_NaClAppProcessType process_type; | 39 PP_NaClAppProcessType process_type; |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 // ServiceRuntime abstracts a NativeClient sel_ldr instance. | 42 // ServiceRuntime abstracts a NativeClient sel_ldr instance. |
| 43 // TODO(dschuff): Merge this with NaClSubprocess, since, that now only contains |
| 44 // a ServiceRuntime. |
| 43 class ServiceRuntime { | 45 class ServiceRuntime { |
| 44 public: | 46 public: |
| 45 ServiceRuntime(Plugin* plugin, | 47 ServiceRuntime(Plugin* plugin, |
| 46 PP_Instance pp_instance, | 48 PP_Instance pp_instance, |
| 47 bool main_service_runtime, | 49 bool main_service_runtime, |
| 48 bool uses_nonsfi_mode); | 50 bool uses_nonsfi_mode); |
| 49 // The destructor terminates the sel_ldr process. | 51 // The destructor terminates the sel_ldr process. |
| 50 ~ServiceRuntime(); | 52 ~ServiceRuntime(); |
| 51 | 53 |
| 52 // Spawn the sel_ldr instance. | 54 // Spawn the sel_ldr instance. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 69 bool uses_nonsfi_mode_; | 71 bool uses_nonsfi_mode_; |
| 70 | 72 |
| 71 std::unique_ptr<IPC::SyncChannel> translator_channel_; | 73 std::unique_ptr<IPC::SyncChannel> translator_channel_; |
| 72 | 74 |
| 73 DISALLOW_COPY_AND_ASSIGN(ServiceRuntime); | 75 DISALLOW_COPY_AND_ASSIGN(ServiceRuntime); |
| 74 }; | 76 }; |
| 75 | 77 |
| 76 } // namespace plugin | 78 } // namespace plugin |
| 77 | 79 |
| 78 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ | 80 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ |
| OLD | NEW |