| Index: webkit/child/resource_loader_bridge.h
|
| diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/child/resource_loader_bridge.h
|
| similarity index 95%
|
| rename from webkit/glue/resource_loader_bridge.h
|
| rename to webkit/child/resource_loader_bridge.h
|
| index 3df3cc3fed83b0421a3e8d45d47e38bc5149d6da..9d51b62f460fa1de6ab23633b441f4774c2d221c 100644
|
| --- a/webkit/glue/resource_loader_bridge.h
|
| +++ b/webkit/child/resource_loader_bridge.h
|
| @@ -13,8 +13,8 @@
|
| // In turn, the bridge's owner on the WebKit end will implement the Peer
|
| // interface, which we will use to communicate notifications back.
|
|
|
| -#ifndef WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
|
| -#define WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
|
| +#ifndef WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
|
| +#define WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
|
|
|
| #include <utility>
|
|
|
| @@ -29,9 +29,9 @@
|
| #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "url/gurl.h"
|
| +#include "webkit/child/webkit_child_export.h"
|
| #include "webkit/common/resource_response_info.h"
|
| -#include "webkit/glue/resource_type.h"
|
| -#include "webkit/glue/webkit_glue_export.h"
|
| +#include "webkit/common/resource_type.h"
|
|
|
| namespace webkit_glue {
|
| class ResourceRequestBody;
|
| @@ -40,7 +40,7 @@ class ResourceLoaderBridge {
|
| public:
|
| // Structure used when calling
|
| // WebKitPlatformSupportImpl::CreateResourceLoader().
|
| - struct WEBKIT_GLUE_EXPORT RequestInfo {
|
| + struct WEBKIT_CHILD_EXPORT RequestInfo {
|
| RequestInfo();
|
| ~RequestInfo();
|
|
|
| @@ -106,8 +106,8 @@ class ResourceLoaderBridge {
|
| // See the SyncLoad method declared below. (The name of this struct is not
|
| // suffixed with "Info" because it also contains the response data.)
|
| struct SyncLoadResponse : ResourceResponseInfo {
|
| - SyncLoadResponse();
|
| - ~SyncLoadResponse();
|
| + WEBKIT_CHILD_EXPORT SyncLoadResponse();
|
| + WEBKIT_CHILD_EXPORT ~SyncLoadResponse();
|
|
|
| // The response error code.
|
| int error_code;
|
| @@ -182,7 +182,7 @@ class ResourceLoaderBridge {
|
|
|
| // use WebKitPlatformSupportImpl::CreateResourceLoader() for construction, but
|
| // anybody can delete at any time, INCLUDING during processing of callbacks.
|
| - WEBKIT_GLUE_EXPORT virtual ~ResourceLoaderBridge();
|
| + WEBKIT_CHILD_EXPORT virtual ~ResourceLoaderBridge();
|
|
|
| // Call this method before calling Start() to set the request body.
|
| // May only be used with HTTP(S) POST requests.
|
| @@ -221,7 +221,7 @@ class ResourceLoaderBridge {
|
| // WebKitPlatformSupportImpl::CreateResourceLoader()
|
| // For HTTP(S) POST requests, the AppendDataToUpload and AppendFileToUpload
|
| // methods may be called to construct the body of the request.
|
| - WEBKIT_GLUE_EXPORT ResourceLoaderBridge();
|
| + WEBKIT_CHILD_EXPORT ResourceLoaderBridge();
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge);
|
| @@ -229,4 +229,4 @@ class ResourceLoaderBridge {
|
|
|
| } // namespace webkit_glue
|
|
|
| -#endif // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_
|
| +#endif // WEBKIT_CHILD_RESOURCE_LOADER_BRIDGE_H_
|
|
|