| 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 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" | 5 #include "ppapi/native_client/src/trusted/plugin/pnacl_resources.h" |
| 6 | 6 |
| 7 #include "native_client/src/include/portability_io.h" | 7 #include "native_client/src/include/portability_io.h" |
| 8 #include "native_client/src/shared/platform/nacl_check.h" | 8 #include "native_client/src/shared/platform/nacl_check.h" |
| 9 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" | 9 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h" |
| 10 #include "ppapi/c/pp_errors.h" | 10 #include "ppapi/c/pp_errors.h" |
| 11 #include "ppapi/native_client/src/trusted/plugin/file_utils.h" | 11 #include "ppapi/native_client/src/trusted/plugin/file_utils.h" |
| 12 #include "ppapi/native_client/src/trusted/plugin/manifest.h" | |
| 13 #include "ppapi/native_client/src/trusted/plugin/plugin.h" | 12 #include "ppapi/native_client/src/trusted/plugin/plugin.h" |
| 14 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" | 13 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" |
| 15 #include "ppapi/native_client/src/trusted/plugin/utility.h" | 14 #include "ppapi/native_client/src/trusted/plugin/utility.h" |
| 16 #include "third_party/jsoncpp/source/include/json/reader.h" | 15 #include "third_party/jsoncpp/source/include/json/reader.h" |
| 17 #include "third_party/jsoncpp/source/include/json/value.h" | 16 #include "third_party/jsoncpp/source/include/json/value.h" |
| 18 | 17 |
| 19 namespace plugin { | 18 namespace plugin { |
| 20 | 19 |
| 21 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/"; | 20 static const char kPnaclBaseUrl[] = "chrome://pnacl-translator/"; |
| 22 | 21 |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 resource_wrappers_[resource_urls[i]] = | 210 resource_wrappers_[resource_urls[i]] = |
| 212 plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY); | 211 plugin_->wrapper_factory()->MakeFileDesc(fd, O_RDONLY); |
| 213 } | 212 } |
| 214 } | 213 } |
| 215 // We're done! Queue the callback. | 214 // We're done! Queue the callback. |
| 216 pp::Core* core = pp::Module::Get()->core(); | 215 pp::Core* core = pp::Module::Get()->core(); |
| 217 core->CallOnMainThread(0, all_loaded_callback, result); | 216 core->CallOnMainThread(0, all_loaded_callback, result); |
| 218 } | 217 } |
| 219 | 218 |
| 220 } // namespace plugin | 219 } // namespace plugin |
| OLD | NEW |