| Index: content/child/npapi/plugin_url_fetcher.h
|
| diff --git a/content/child/npapi/plugin_url_fetcher.h b/content/child/npapi/plugin_url_fetcher.h
|
| index 4e5e2ffc57d142962d4eb5e129e196a1538ff1f4..0350dab3e3ff68f78b6dd095b77d0dfb921b1afe 100644
|
| --- a/content/child/npapi/plugin_url_fetcher.h
|
| +++ b/content/child/npapi/plugin_url_fetcher.h
|
| @@ -8,8 +8,8 @@
|
| #include <string>
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/public/child/request_delegate_peer.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/child/resource_loader_bridge.h"
|
|
|
| namespace webkit_glue {
|
| class MultipartResponseDelegate;
|
| @@ -20,7 +20,7 @@ namespace content {
|
| class PluginStreamUrl;
|
|
|
| // Fetches URLS for a plugin using ResourceDispatcher.
|
| -class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
| +class PluginURLFetcher : public RequestDelegatePeer {
|
| public:
|
| PluginURLFetcher(PluginStreamUrl* plugin_stream,
|
| const GURL& url,
|
| @@ -47,7 +47,7 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
| bool pending_failure_notification() { return pending_failure_notification_; }
|
|
|
| private:
|
| - // webkit_glue::ResourceLoaderBridge::Peer implementation:
|
| + // RequestDelegatePeer implementation:
|
| virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
|
| virtual bool OnReceivedRedirect(const GURL& new_url,
|
| const webkit_glue::ResourceResponseInfo& info,
|
| @@ -59,13 +59,12 @@ class PluginURLFetcher : public webkit_glue::ResourceLoaderBridge::Peer {
|
| virtual void OnReceivedData(const char* data,
|
| int data_length,
|
| int encoded_data_length) OVERRIDE;
|
| - virtual void OnCompletedRequest(
|
| - int error_code,
|
| - bool was_ignored_by_handler,
|
| - bool stale_copy_in_cache,
|
| - const std::string& security_info,
|
| - const base::TimeTicks& completion_time,
|
| - int64 total_transfer_size) OVERRIDE;
|
| + virtual void OnCompletedRequest(int error_code,
|
| + bool was_ignored_by_handler,
|
| + bool stale_copy_in_cache,
|
| + const std::string& security_info,
|
| + const base::TimeTicks& completion_time,
|
| + int64 total_transfer_size) OVERRIDE;
|
|
|
| PluginStreamUrl* plugin_stream_;
|
| GURL url_;
|
|
|