| Index: content/browser/appcache/appcache_storage.h
|
| diff --git a/webkit/browser/appcache/appcache_storage.h b/content/browser/appcache/appcache_storage.h
|
| similarity index 96%
|
| rename from webkit/browser/appcache/appcache_storage.h
|
| rename to content/browser/appcache/appcache_storage.h
|
| index 41bbd552bfc8f9a41a50709b5ac41cc35710de74..871110c17eb64d153fa30b8f5bd0aa79279e7f1a 100644
|
| --- a/webkit/browser/appcache/appcache_storage.h
|
| +++ b/content/browser/appcache/appcache_storage.h
|
| @@ -2,8 +2,8 @@
|
| // 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_STORAGE_H_
|
| -#define WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
|
| +#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
|
| +#define CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
|
|
|
| #include <map>
|
| #include <vector>
|
| @@ -13,9 +13,9 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/browser/appcache/appcache_working_set.h"
|
| +#include "content/common/content_export.h"
|
| #include "net/base/completion_callback.h"
|
| -#include "webkit/browser/appcache/appcache_working_set.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
|
|
| class GURL;
|
|
|
| @@ -27,7 +27,7 @@ class AppCacheResponseTest;
|
| class AppCacheStorageTest;
|
| }
|
|
|
| -namespace appcache {
|
| +namespace content {
|
|
|
| class AppCache;
|
| class AppCacheEntry;
|
| @@ -38,11 +38,11 @@ class AppCacheServiceImpl;
|
| struct AppCacheInfoCollection;
|
| struct HttpResponseInfoIOBuffer;
|
|
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheStorage {
|
| +class CONTENT_EXPORT AppCacheStorage {
|
| public:
|
| typedef std::map<GURL, int64> UsageMap;
|
|
|
| - class WEBKIT_STORAGE_BROWSER_EXPORT Delegate {
|
| + class CONTENT_EXPORT Delegate {
|
| public:
|
| // If retrieval fails, 'collection' will be NULL.
|
| virtual void OnAllInfo(AppCacheInfoCollection* collection) {}
|
| @@ -325,6 +325,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCacheStorage {
|
| DISALLOW_COPY_AND_ASSIGN(AppCacheStorage);
|
| };
|
|
|
| -} // namespace appcache
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
|
| +#endif // CONTENT_BROWSER_APPCACHE_APPCACHE_STORAGE_H_
|
|
|