| Index: ppapi/native_client/src/trusted/plugin/pnacl_resources.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.h b/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
|
| index 263dcf6f2942f003b99ef23f9e1f96170ee57794..3363e17a397f494885ce63b62fb4b8500017f6a4 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
|
| @@ -15,7 +15,6 @@
|
| #include "ppapi/c/private/pp_file_handle.h"
|
| #include "ppapi/cpp/completion_callback.h"
|
|
|
| -#include "ppapi/native_client/src/trusted/plugin/nexe_arch.h"
|
| #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
|
|
|
| namespace plugin {
|
| @@ -30,9 +29,6 @@ class PnaclUrls {
|
| // Get the base URL prefix for Pnacl resources (without platform prefix).
|
| static nacl::string GetBaseUrl();
|
|
|
| - // Return {platform_prefix}/url
|
| - static nacl::string PrependPlatformPrefix(const nacl::string& url);
|
| -
|
| static bool IsPnaclComponent(const nacl::string& full_url);
|
| static nacl::string PnaclComponentURLToFilename(
|
| const nacl::string& full_url);
|
| @@ -78,7 +74,8 @@ class PnaclResources {
|
| return ld_tool_name;
|
| }
|
|
|
| - nacl::string GetFullUrl(const nacl::string& partial_url) const;
|
| + nacl::string GetFullUrl(const nacl::string& partial_url,
|
| + const nacl::string& sandbox_arch) const;
|
|
|
| // Get file descs by name. Only valid after StartLoad's completion callback
|
| // fired.
|
|
|