Index: content/browser/appcache/manifest_parser.h |
diff --git a/webkit/browser/appcache/manifest_parser.h b/content/browser/appcache/manifest_parser.h |
similarity index 79% |
rename from webkit/browser/appcache/manifest_parser.h |
rename to content/browser/appcache/manifest_parser.h |
index c8d5f00a91359201cf71cffcb0aa313527bde7dc..4deb5998ccd3e18748a61bc2d4a21fc77a030a38 100644 |
--- a/webkit/browser/appcache/manifest_parser.h |
+++ b/content/browser/appcache/manifest_parser.h |
@@ -29,28 +29,28 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |
-#define WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |
+#ifndef CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |
+#define CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |
#include <string> |
#include <vector> |
#include "base/containers/hash_tables.h" |
-#include "webkit/browser/webkit_storage_browser_export.h" |
-#include "webkit/common/appcache/appcache_interfaces.h" |
+#include "content/common/appcache_interfaces.h" |
+#include "content/common/content_export.h" |
class GURL; |
-namespace appcache { |
+namespace content { |
-struct WEBKIT_STORAGE_BROWSER_EXPORT Manifest { |
+struct CONTENT_EXPORT Manifest { |
Manifest(); |
~Manifest(); |
base::hash_set<std::string> explicit_urls; |
- NamespaceVector intercept_namespaces; |
- NamespaceVector fallback_namespaces; |
- NamespaceVector online_whitelist_namespaces; |
+ AppCacheNamespaceVector intercept_namespaces; |
+ AppCacheNamespaceVector fallback_namespaces; |
+ AppCacheNamespaceVector online_whitelist_namespaces; |
bool online_whitelist_all; |
bool did_ignore_intercept_namespaces; |
}; |
@@ -60,13 +60,13 @@ enum ParseMode { |
PARSE_MANIFEST_ALLOWING_INTERCEPTS |
}; |
-WEBKIT_STORAGE_BROWSER_EXPORT bool ParseManifest( |
+CONTENT_EXPORT bool ParseManifest( |
const GURL& manifest_url, |
const char* data, |
int length, |
ParseMode parse_mode, |
Manifest& manifest); |
-} // namespace appcache |
+} // namespace content |
-#endif // WEBKIT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |
+#endif // CONTENT_BROWSER_APPCACHE_MANIFEST_PARSER_H_ |