Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(759)

Unified Diff: ppapi/native_client/src/trusted/plugin/manifest.cc

Issue 8525014: Get all the resources relative to a single base. Currently the same base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/manifest.h ('k') | ppapi/native_client/src/trusted/plugin/plugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/src/trusted/plugin/manifest.cc
===================================================================
--- ppapi/native_client/src/trusted/plugin/manifest.cc (revision 109525)
+++ ppapi/native_client/src/trusted/plugin/manifest.cc (working copy)
@@ -60,10 +60,6 @@
// }
// }
-// TODO(jvoung): Remove these when we find a better way to store/install them.
-const char* const kPnaclLlcKey = "pnacl-llc";
-const char* const kPnaclLdKey = "pnacl-ld";
-
// Looks up |property_name| in the vector |valid_names| with length
// |valid_name_count|. Returns true if |property_name| is found.
bool FindMatchingProperty(nacl::string property_name,
@@ -434,67 +430,4 @@
full_url, error_info, is_portable, this);
}
-// TODO(jvoung): We won't need these if we figure out how to install llc and ld.
-bool Manifest::GetLLCURL(nacl::string* full_url, ErrorInfo* error_info) {
- if (full_url == NULL || error_info == NULL)
- return false;
-
- Json::Value pnacl_llc = dictionary_[kPnaclLlcKey];
-
- nacl::string nexe_url;
- nacl::string error_string;
- bool is_portable;
- if (!GetURLFromISADictionary(pnacl_llc,
- sandbox_isa_,
- &nexe_url,
- &error_string,
- &is_portable)) {
- error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL,
- nacl::string(kPnaclLlcKey) + ":" + sandbox_isa_ +
- error_string);
- return false;
- }
-
- if (is_portable) {
- // Bootstrap problem -- we need this to translate portable programs!
- error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL,
- nacl::string(kPnaclLlcKey) +
- " must be pre-translated for " + sandbox_isa_ + "!");
- return false;
- }
-
- return ResolveURL(nexe_url, full_url, error_info);
-}
-
-bool Manifest::GetLDURL(nacl::string* full_url, ErrorInfo* error_info) {
- if (full_url == NULL || error_info == NULL)
- return false;
-
- Json::Value pnacl_ld = dictionary_[kPnaclLdKey];
-
- nacl::string nexe_url;
- nacl::string error_string;
- bool is_portable;
- if (!GetURLFromISADictionary(pnacl_ld,
- sandbox_isa_,
- &nexe_url,
- &error_string,
- &is_portable)) {
- error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL,
- nacl::string(kPnaclLdKey) + ":" + sandbox_isa_ +
- error_string);
- return false;
- }
-
- if (is_portable) {
- // Bootstrap problem -- we need this to translate portable programs!
- error_info->SetReport(ERROR_MANIFEST_GET_NEXE_URL,
- nacl::string(kPnaclLdKey) +
- " must be pre-translated for " + sandbox_isa_ + "!");
- return false;
- }
-
- return ResolveURL(nexe_url, full_url, error_info);
-}
-
} // namespace plugin
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/manifest.h ('k') | ppapi/native_client/src/trusted/plugin/plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698