| Index: content/public/common/resource_response.h
|
| ===================================================================
|
| --- content/public/common/resource_response.h (revision 111374)
|
| +++ content/public/common/resource_response.h (working copy)
|
| @@ -4,18 +4,21 @@
|
|
|
| // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
|
|
|
| -#ifndef CONTENT_COMMON_RESOURCE_RESPONSE_H_
|
| -#define CONTENT_COMMON_RESOURCE_RESPONSE_H_
|
| +#ifndef CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_H_
|
| +#define CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_H_
|
| #pragma once
|
|
|
| #include <string>
|
|
|
| +#include "base/compiler_specific.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "content/common/content_export.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "net/url_request/url_request_status.h"
|
| #include "webkit/glue/resource_loader_bridge.h"
|
|
|
| +namespace content {
|
| +
|
| // Parameters for a resource response header.
|
| struct ResourceResponseHead : webkit_glue::ResourceResponseInfo {
|
| // The response status.
|
| @@ -33,15 +36,15 @@
|
|
|
| // Simple wrapper that refcounts ResourceResponseHead.
|
| struct CONTENT_EXPORT ResourceResponse
|
| - : public base::RefCounted<ResourceResponse> {
|
| - ResourceResponse();
|
| + : public NON_EXPORTED_BASE(ResourceResponseHead),
|
| + public base::RefCounted<ResourceResponse> {
|
|
|
| - ResourceResponseHead response_head;
|
| -
|
| private:
|
| friend class base::RefCounted<ResourceResponse>;
|
|
|
| - ~ResourceResponse();
|
| + ~ResourceResponse() {}
|
| };
|
|
|
| -#endif // CONTENT_COMMON_RESOURCE_RESPONSE_H_
|
| +} // namespace content
|
| +
|
| +#endif // CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_H_
|
|
|