Index: ppapi/native_client/src/trusted/plugin/pnacl_resources.h |
=================================================================== |
--- ppapi/native_client/src/trusted/plugin/pnacl_resources.h (revision 114029) |
+++ ppapi/native_client/src/trusted/plugin/pnacl_resources.h (working copy) |
@@ -24,17 +24,19 @@ |
class PnaclResources { |
robertm
2011/12/13 17:06:39
pre-existing but since this is a central class: ad
sehr (please use chromium)
2011/12/13 20:05:04
As this CL removes most of the need for the PnaclR
|
public: |
- PnaclResources(Plugin* plugin, PnaclCoordinator* coordinator) |
+ PnaclResources(Plugin* plugin, |
+ PnaclCoordinator* coordinator, |
+ const nacl::string& resource_base_url) |
: plugin_(plugin), |
robertm
2011/12/13 17:06:39
pre-existing
the dependency on both the plugin and
sehr (please use chromium)
2011/12/13 20:05:04
See above.
|
coordinator_(coordinator), |
all_loaded_(true), |
- client_callback_is_valid_(false) |
- { } |
+ client_callback_is_valid_(false), |
+ resource_base_url_(resource_base_url) { |
+ callback_factory_.Initialize(this); |
+ } |
virtual ~PnaclResources(); |
- void Initialize(); |
- |
// URLs are all relative to the coordinator's resource_base_url(). |
// Get the wrapper for the downloaded resource. |
robertm
2011/12/13 17:06:39
when is it ok to call this function?
sehr (please use chromium)
2011/12/13 20:05:04
Comment added.
|
@@ -75,6 +77,8 @@ |
// this indicates that the registered client callback should be used when |
// the last resource arrives. |
bool client_callback_is_valid_; |
+ // The base url for looking up resources. |
+ nacl::string resource_base_url_; |
// Factory for ready callbacks, etc. |
pp::CompletionCallbackFactory<PnaclResources> callback_factory_; |
}; |