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/plugin.h" | 11 #include "ppapi/native_client/src/trusted/plugin/plugin.h" |
12 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" | 12 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" |
13 #include "ppapi/native_client/src/trusted/plugin/utility.h" | 13 #include "ppapi/native_client/src/trusted/plugin/utility.h" |
14 #include "third_party/jsoncpp/source/include/json/reader.h" | |
15 #include "third_party/jsoncpp/source/include/json/value.h" | |
16 | 14 |
17 namespace plugin { | 15 namespace plugin { |
18 | 16 |
19 namespace { | 17 namespace { |
20 | 18 |
21 nacl::string GetFullUrl(const nacl::string& partial_url) { | 19 nacl::string GetFullUrl(const nacl::string& partial_url) { |
22 return PnaclUrls::GetBaseUrl() + GetNaClInterface()->GetSandboxArch() + "/" + | 20 return PnaclUrls::GetBaseUrl() + GetNaClInterface()->GetSandboxArch() + "/" + |
23 partial_url; | 21 partial_url; |
24 } | 22 } |
25 | 23 |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 PP_NACL_ERROR_PNACL_RESOURCE_FETCH, | 135 PP_NACL_ERROR_PNACL_RESOURCE_FETCH, |
138 nacl::string("The Portable Native Client (pnacl) component is not " | 136 nacl::string("The Portable Native Client (pnacl) component is not " |
139 "installed. Please consult chrome://components for more " | 137 "installed. Please consult chrome://components for more " |
140 "information.")); | 138 "information.")); |
141 result = PP_ERROR_FILENOTFOUND; | 139 result = PP_ERROR_FILENOTFOUND; |
142 } | 140 } |
143 pp::Module::Get()->core()->CallOnMainThread(0, all_loaded_callback, result); | 141 pp::Module::Get()->core()->CallOnMainThread(0, all_loaded_callback, result); |
144 } | 142 } |
145 | 143 |
146 } // namespace plugin | 144 } // namespace plugin |
OLD | NEW |