Index: content/browser/appcache/appcache_response.h |
diff --git a/webkit/browser/appcache/appcache_response.h b/content/browser/appcache/appcache_response.h |
similarity index 93% |
rename from webkit/browser/appcache/appcache_response.h |
rename to content/browser/appcache/appcache_response.h |
index d9695b34222780bf04f41bdec2eb0a72b7138793..474b4d0c6cd7585ebc215d3275c90ed8071065e2 100644 |
--- a/webkit/browser/appcache/appcache_response.h |
+++ b/content/browser/appcache/appcache_response.h |
@@ -2,18 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |
-#define WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "content/common/appcache_interfaces.h" |
+#include "content/common/content_export.h" |
#include "net/base/completion_callback.h" |
#include "net/http/http_response_info.h" |
#include "url/gurl.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/appcache/appcache_interfaces.h" |
namespace net { |
class IOBuffer; |
@@ -23,7 +23,7 @@ namespace content { |
class MockAppCacheStorage; |
} |
-namespace appcache { |
+namespace content { |
class AppCacheStorage; |
@@ -31,7 +31,7 @@ static const int kUnkownResponseDataSize = -1; |
// Response info for a particular response id. Instances are tracked in |
// the working set. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseInfo |
+class CONTENT_EXPORT AppCacheResponseInfo |
: public base::RefCounted<AppCacheResponseInfo> { |
public: |
// AppCacheResponseInfo takes ownership of the http_info. |
@@ -59,7 +59,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseInfo |
// A refcounted wrapper for HttpResponseInfo so we can apply the |
// refcounting semantics used with IOBuffer with these structures too. |
-struct WEBKIT_STORAGE_BROWSER_EXPORT HttpResponseInfoIOBuffer |
+struct CONTENT_EXPORT HttpResponseInfoIOBuffer |
: public base::RefCountedThreadSafe<HttpResponseInfoIOBuffer> { |
scoped_ptr<net::HttpResponseInfo> http_info; |
int response_data_size; |
@@ -73,7 +73,7 @@ struct WEBKIT_STORAGE_BROWSER_EXPORT HttpResponseInfoIOBuffer |
}; |
// Low level storage API used by the response reader and writer. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCacheInterface { |
+class CONTENT_EXPORT AppCacheDiskCacheInterface { |
public: |
class Entry { |
public: |
@@ -99,7 +99,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheDiskCacheInterface { |
}; |
// Common base class for response reader and writer. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseIO { |
+class CONTENT_EXPORT AppCacheResponseIO { |
public: |
virtual ~AppCacheResponseIO(); |
int64 response_id() const { return response_id_; } |
@@ -135,7 +135,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseIO { |
// and there is a read in progress, the implementation will return |
// immediately but will take care of any side effect of cancelling the |
// operation. In other words, instances are safe to delete at will. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseReader |
+class CONTENT_EXPORT AppCacheResponseReader |
: public AppCacheResponseIO { |
public: |
virtual ~AppCacheResponseReader(); |
@@ -198,7 +198,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseReader |
// and there is a write in progress, the implementation will return |
// immediately but will take care of any side effect of cancelling the |
// operation. In other words, instances are safe to delete at will. |
-class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseWriter |
+class CONTENT_EXPORT AppCacheResponseWriter |
: public AppCacheResponseIO { |
public: |
virtual ~AppCacheResponseWriter(); |
@@ -261,6 +261,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheResponseWriter |
base::WeakPtrFactory<AppCacheResponseWriter> weak_factory_; |
}; |
-} // namespace appcache |
+} // namespace content |
-#endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |
+#endif // CONTENT_BROWSER_APPCACHE_APPCACHE_RESPONSE_H_ |