Index: content/child/resource_loader_bridge.h |
diff --git a/webkit/child/resource_loader_bridge.h b/content/child/resource_loader_bridge.h |
similarity index 82% |
rename from webkit/child/resource_loader_bridge.h |
rename to content/child/resource_loader_bridge.h |
index 19077581b4fad0b96c00bb6655f34233338c5700..7dbc48d1a656557a5912abf6d2caeee9f56db93c 100644 |
--- a/webkit/child/resource_loader_bridge.h |
+++ b/content/child/resource_loader_bridge.h |
@@ -14,40 +14,38 @@ |
// RequestPeer interface, which we will use to communicate notifications |
// back. |
-#ifndef WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |
-#define WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |
+#ifndef CONTENT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |
+#define CONTENT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |
#include "base/macros.h" |
+#include "content/common/content_export.h" |
#include "net/base/request_priority.h" |
-#include "webkit/child/webkit_child_export.h" |
namespace blink { |
class WebThreadedDataReceiver; |
} |
-// TODO(pilgrim) remove this once resource loader is moved to content |
-// http://crbug.com/338338 |
namespace content { |
+ |
class RequestPeer; |
class ResourceRequestBody; |
struct SyncLoadResponse; |
-} |
- |
-namespace webkit_glue { |
-class ResourceLoaderBridge { |
+// TODO(tfarina): Refactor code that uses this class. This shouldn't be needed |
+// now that it lives in content/. |
+class CONTENT_EXPORT ResourceLoaderBridge { |
public: |
// use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but |
// anybody can delete at any time, INCLUDING during processing of callbacks. |
- WEBKIT_CHILD_EXPORT virtual ~ResourceLoaderBridge(); |
+ virtual ~ResourceLoaderBridge(); |
// Call this method before calling Start() to set the request body. |
// May only be used with HTTP(S) POST requests. |
- virtual void SetRequestBody(content::ResourceRequestBody* request_body) = 0; |
+ virtual void SetRequestBody(ResourceRequestBody* request_body) = 0; |
// Call this method to initiate the request. If this method succeeds, then |
// the peer's methods will be called asynchronously to report various events. |
- virtual bool Start(content::RequestPeer* peer) = 0; |
+ virtual bool Start(RequestPeer* peer) = 0; |
// Call this method to cancel a request that is in progress. This method |
// causes the request to immediately transition into the 'done' state. The |
@@ -77,19 +75,19 @@ class ResourceLoaderBridge { |
// use this if you really need it! There is also no way for the caller to |
// interrupt this method. Errors are reported via the status field of the |
// response parameter. |
- virtual void SyncLoad(content::SyncLoadResponse* response) = 0; |
+ virtual void SyncLoad(SyncLoadResponse* response) = 0; |
protected: |
// Construction must go through |
// WebKitPlatformSupportImpl::CreateResourceLoader() |
// For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload |
// methods may be called to construct the body of the request. |
- WEBKIT_CHILD_EXPORT ResourceLoaderBridge(); |
+ ResourceLoaderBridge(); |
private: |
DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge); |
}; |
-} // namespace webkit_glue |
+} // namespace content |
-#endif // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |
+#endif // CONTENT_CHILD_RESOURCE_LOADER_BRIDGE_H_ |