| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 | 69 |
| 70 bool main_service_runtime() const { return main_service_runtime_; } | 70 bool main_service_runtime() const { return main_service_runtime_; } |
| 71 | 71 |
| 72 private: | 72 private: |
| 73 NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime); | 73 NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime); |
| 74 | 74 |
| 75 bool SetupCommandChannel(); | 75 bool SetupCommandChannel(); |
| 76 | 76 |
| 77 void ReportLoadError(const ErrorInfo& error_info); | 77 void ReportLoadError(const ErrorInfo& error_info); |
| 78 | 78 |
| 79 NaClSrpcChannel command_channel_; | |
| 80 Plugin* plugin_; | 79 Plugin* plugin_; |
| 81 PP_Instance pp_instance_; | 80 PP_Instance pp_instance_; |
| 82 bool main_service_runtime_; | 81 bool main_service_runtime_; |
| 83 bool uses_nonsfi_mode_; | 82 bool uses_nonsfi_mode_; |
| 84 nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_; | 83 nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_; |
| 85 | 84 |
| 86 NaClHandle bootstrap_channel_; | 85 NaClHandle bootstrap_channel_; |
| 87 }; | 86 }; |
| 88 | 87 |
| 89 } // namespace plugin | 88 } // namespace plugin |
| 90 | 89 |
| 91 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ | 90 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_SERVICE_RUNTIME_H_ |
| OLD | NEW |