| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
| 4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
| 5 */ | 5 */ |
| 6 | 6 |
| 7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" | 7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" |
| 8 | 8 |
| 9 #include "native_client/src/trusted/plugin/service_runtime.h" | 9 #include "native_client/src/trusted/plugin/service_runtime.h" |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "native_client/src/trusted/desc/nrd_xfer.h" | 33 #include "native_client/src/trusted/desc/nrd_xfer.h" |
| 34 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" | 34 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h" |
| 35 #include "native_client/src/trusted/plugin/manifest.h" | 35 #include "native_client/src/trusted/plugin/manifest.h" |
| 36 | 36 |
| 37 // This is here due to a Windows API collision; plugin.h through | 37 // This is here due to a Windows API collision; plugin.h through |
| 38 // file_downloader.h transitively includes Instance.h which defines a | 38 // file_downloader.h transitively includes Instance.h which defines a |
| 39 // PostMessage method, so this undef must appear before any of those. | 39 // PostMessage method, so this undef must appear before any of those. |
| 40 #ifdef PostMessage | 40 #ifdef PostMessage |
| 41 #undef PostMessage | 41 #undef PostMessage |
| 42 #endif | 42 #endif |
| 43 #include "native_client/src/public/imc_types.h" |
| 43 #include "native_client/src/trusted/plugin/plugin.h" | 44 #include "native_client/src/trusted/plugin/plugin.h" |
| 44 #include "native_client/src/trusted/plugin/plugin_error.h" | 45 #include "native_client/src/trusted/plugin/plugin_error.h" |
| 45 #include "native_client/src/trusted/plugin/pnacl_coordinator.h" | 46 #include "native_client/src/trusted/plugin/pnacl_coordinator.h" |
| 46 #include "native_client/src/trusted/plugin/pnacl_resources.h" | 47 #include "native_client/src/trusted/plugin/pnacl_resources.h" |
| 47 #include "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" | 48 #include "native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h" |
| 48 #include "native_client/src/trusted/plugin/srpc_client.h" | 49 #include "native_client/src/trusted/plugin/srpc_client.h" |
| 49 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" | 50 #include "native_client/src/trusted/service_runtime/nacl_error_code.h" |
| 50 #include "native_client/src/trusted/service_runtime/include/sys/nacl_imc_api.h" | |
| 51 #include "native_client/src/trusted/validator/nacl_file_info.h" | 51 #include "native_client/src/trusted/validator/nacl_file_info.h" |
| 52 #include "native_client/src/trusted/weak_ref/call_on_main_thread.h" | 52 #include "native_client/src/trusted/weak_ref/call_on_main_thread.h" |
| 53 | 53 |
| 54 #include "ppapi/c/pp_errors.h" | 54 #include "ppapi/c/pp_errors.h" |
| 55 #include "ppapi/c/trusted/ppb_file_io_trusted.h" | 55 #include "ppapi/c/trusted/ppb_file_io_trusted.h" |
| 56 #include "ppapi/cpp/core.h" | 56 #include "ppapi/cpp/core.h" |
| 57 #include "ppapi/cpp/completion_callback.h" | 57 #include "ppapi/cpp/completion_callback.h" |
| 58 #include "ppapi/cpp/file_io.h" | 58 #include "ppapi/cpp/file_io.h" |
| 59 | 59 |
| 60 namespace { | 60 namespace { |
| (...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 852 | 852 |
| 853 nacl::string ServiceRuntime::GetCrashLogOutput() { | 853 nacl::string ServiceRuntime::GetCrashLogOutput() { |
| 854 if (NULL != subprocess_.get()) { | 854 if (NULL != subprocess_.get()) { |
| 855 return subprocess_->GetCrashLogOutput(); | 855 return subprocess_->GetCrashLogOutput(); |
| 856 } else { | 856 } else { |
| 857 return std::string(); | 857 return std::string(); |
| 858 } | 858 } |
| 859 } | 859 } |
| 860 | 860 |
| 861 } // namespace plugin | 861 } // namespace plugin |
| OLD | NEW |