| Index: components/nacl/renderer/manifest_downloader.h
|
| diff --git a/components/nacl/renderer/manifest_downloader.h b/components/nacl/renderer/manifest_downloader.h
|
| index dbdbf8453c6d1a3b200a9fa1bdbc84e9f62a9e4e..7fd4b922da2ce13f5bdfcedbcf88a8f991e7f3f4 100644
|
| --- a/components/nacl/renderer/manifest_downloader.h
|
| +++ b/components/nacl/renderer/manifest_downloader.h
|
| @@ -5,6 +5,7 @@
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "ppapi/c/private/ppb_nacl_private.h"
|
| #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
|
|
|
| @@ -20,12 +21,15 @@ namespace nacl {
|
| // caller through a callback.
|
| class ManifestDownloader : public blink::WebURLLoaderClient {
|
| public:
|
| - typedef base::Callback<void(PP_NaClError, const std::string&)>
|
| - ManifestDownloaderCallback;
|
| + typedef base::Callback<void(PP_NaClError, const std::string&)> Callback;
|
|
|
| - ManifestDownloader(bool is_installed, ManifestDownloaderCallback cb);
|
| + ManifestDownloader(scoped_ptr<blink::WebURLLoader> url_loader,
|
| + bool is_installed,
|
| + Callback cb);
|
| virtual ~ManifestDownloader();
|
|
|
| + void Load(const blink::WebURLRequest& request);
|
| +
|
| private:
|
| // WebURLLoaderClient implementation.
|
| virtual void didReceiveResponse(blink::WebURLLoader* loader,
|
| @@ -40,8 +44,9 @@ class ManifestDownloader : public blink::WebURLLoaderClient {
|
| virtual void didFail(blink::WebURLLoader* loader,
|
| const blink::WebURLError& error);
|
|
|
| + scoped_ptr<blink::WebURLLoader> url_loader_;
|
| bool is_installed_;
|
| - ManifestDownloaderCallback cb_;
|
| + Callback cb_;
|
| std::string buffer_;
|
| int status_code_;
|
| PP_NaClError pp_nacl_error_;
|
|
|