| Index: content/browser/appcache/appcache.h
|
| diff --git a/webkit/browser/appcache/appcache.h b/content/browser/appcache/appcache.h
|
| similarity index 94%
|
| rename from webkit/browser/appcache/appcache.h
|
| rename to content/browser/appcache/appcache.h
|
| index 54713b75a1f38f55a03c1b81dc1d3efc379f0c41..db312e6e7fb9f56d0d7d4a5086995a1d91b12514 100644
|
| --- a/webkit/browser/appcache/appcache.h
|
| +++ b/content/browser/appcache/appcache.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_H_
|
| -#define WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
|
| +#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_H_
|
| +#define CONTENT_BROWSER_APPCACHE_APPCACHE_H_
|
|
|
| #include <map>
|
| #include <set>
|
| @@ -12,11 +12,11 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/time/time.h"
|
| +#include "content/browser/appcache/appcache_database.h"
|
| +#include "content/browser/appcache/appcache_entry.h"
|
| +#include "content/browser/appcache/manifest_parser.h"
|
| +#include "content/common/content_export.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/browser/appcache/appcache_database.h"
|
| -#include "webkit/browser/appcache/appcache_entry.h"
|
| -#include "webkit/browser/appcache/manifest_parser.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
|
|
| namespace net {
|
| class IOBuffer;
|
| @@ -30,7 +30,7 @@ class AppCacheStorageImplTest;
|
| class AppCacheUpdateJobTest;
|
| }
|
|
|
| -namespace appcache {
|
| +namespace content {
|
|
|
| class AppCacheExecutableHandler;
|
| class AppCacheGroup;
|
| @@ -40,7 +40,7 @@ class AppCacheStorage;
|
| // Set of cached resources for an application. A cache exists as long as a
|
| // host is associated with it, the cache is in an appcache group or the
|
| // cache is being created during an appcache upate.
|
| -class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
|
| +class CONTENT_EXPORT AppCache
|
| : public base::RefCounted<AppCache> {
|
| public:
|
| typedef std::map<GURL, AppCacheEntry> EntryMap;
|
| @@ -209,6 +209,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT AppCache
|
| DISALLOW_COPY_AND_ASSIGN(AppCache);
|
| };
|
|
|
| -} // namespace appcache
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_H_
|
| +#endif // CONTENT_BROWSER_APPCACHE_APPCACHE_H_
|
|
|