Index: Source/WebKit/chromium/public/WebCachedURLRequest.h |
diff --git a/Source/WebKit/chromium/public/WebCachedURLRequest.h b/Source/WebKit/chromium/public/WebCachedURLRequest.h |
index 075ba72c5d640c132015dcc5c7ef85e9166efc43..903a5f040179b326fe8c95226c8ca1d04cd252ba 100644 |
--- a/Source/WebKit/chromium/public/WebCachedURLRequest.h |
+++ b/Source/WebKit/chromium/public/WebCachedURLRequest.h |
@@ -1,70 +1 @@ |
-/* |
- * Copyright (C) 2012 Google Inc. All rights reserved. |
- * |
- * Redistribution and use in source and binary forms, with or without |
- * modification, are permitted provided that the following conditions are |
- * met: |
- * |
- * * Redistributions of source code must retain the above copyright |
- * notice, this list of conditions and the following disclaimer. |
- * * Redistributions in binary form must reproduce the above |
- * copyright notice, this list of conditions and the following disclaimer |
- * in the documentation and/or other materials provided with the |
- * distribution. |
- * * Neither the name of Google Inc. nor the names of its |
- * contributors may be used to endorse or promote products derived from |
- * this software without specific prior written permission. |
- * |
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- */ |
- |
-#ifndef WebCachedURLRequest_h |
-#define WebCachedURLRequest_h |
- |
-#include "../../../../public/platform/WebCommon.h" |
-#include "../../../../public/platform/WebPrivateOwnPtr.h" |
-#include "../../../../public/platform/WebString.h" |
- |
-namespace WebCore { class CachedResourceRequest; } |
- |
-namespace WebKit { |
- |
-class WebString; |
-class WebURLRequest; |
-class WrappedResourceRequest; |
- |
-class WebCachedURLRequest { |
-public: |
- ~WebCachedURLRequest() { reset(); } |
- WEBKIT_EXPORT void reset(); |
- |
- WEBKIT_EXPORT const WebURLRequest& urlRequest() const; |
- WEBKIT_EXPORT WebString charset() const; |
- WEBKIT_EXPORT bool forPreload() const; |
- WEBKIT_EXPORT WebString initiatorName() const; |
- |
-#if WEBKIT_IMPLEMENTATION |
- explicit WebCachedURLRequest(WebCore::CachedResourceRequest*); |
-#endif |
- |
-private: |
- WebCachedURLRequest(const WebCachedURLRequest&); |
- WebCachedURLRequest& operator=(const WebCachedURLRequest&); |
- |
- WebCore::CachedResourceRequest* m_private; |
- mutable WebPrivateOwnPtr<WrappedResourceRequest> m_resourceRequestWrapper; |
-}; |
- |
-} // namespace WebKit |
- |
-#endif |
+#include "../../../../public/webview/WebCachedURLRequest.h" |