| Index: content/browser/appcache/appcache_quota_client.h
|
| diff --git a/webkit/browser/appcache/appcache_quota_client.h b/content/browser/appcache/appcache_quota_client.h
|
| similarity index 87%
|
| rename from webkit/browser/appcache/appcache_quota_client.h
|
| rename to content/browser/appcache/appcache_quota_client.h
|
| index 825f38e16580d24d5b65d5525f7792625f924f21..e0b7aaca6a6dcc128360239bc67372436cc907f1 100644
|
| --- a/webkit/browser/appcache/appcache_quota_client.h
|
| +++ b/content/browser/appcache/appcache_quota_client.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_QUOTA_CLIENT_H_
|
| -#define WEBKIT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
|
| +#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
|
| +#define CONTENT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
|
|
|
| #include <deque>
|
| #include <map>
|
| @@ -12,18 +12,18 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/browser/appcache/appcache_storage.h"
|
| +#include "content/common/content_export.h"
|
| #include "net/base/completion_callback.h"
|
| -#include "webkit/browser/appcache/appcache_storage.h"
|
| #include "webkit/browser/quota/quota_client.h"
|
| #include "webkit/browser/quota/quota_task.h"
|
| -#include "webkit/browser/webkit_storage_browser_export.h"
|
| #include "webkit/common/quota/quota_types.h"
|
|
|
| namespace content {
|
| class AppCacheQuotaClientTest;
|
| }
|
|
|
| -namespace appcache {
|
| +namespace content {
|
|
|
| class AppCacheServiceImpl;
|
| class AppCacheStorageImpl;
|
| @@ -61,7 +61,7 @@ class AppCacheQuotaClient : public quota::QuotaClient {
|
| friend class AppCacheServiceImpl; // for NotifyAppCacheIsDestroyed
|
| friend class AppCacheStorageImpl; // for NotifyAppCacheIsReady
|
|
|
| - WEBKIT_STORAGE_BROWSER_EXPORT
|
| + CONTENT_EXPORT
|
| explicit AppCacheQuotaClient(AppCacheServiceImpl* service);
|
|
|
| void DidDeleteAppCachesForOrigin(int rv);
|
| @@ -74,8 +74,8 @@ class AppCacheQuotaClient : public quota::QuotaClient {
|
| net::CancelableCompletionCallback* GetServiceDeleteCallback();
|
|
|
| // For use by appcache internals during initialization and shutdown.
|
| - WEBKIT_STORAGE_BROWSER_EXPORT void NotifyAppCacheReady();
|
| - WEBKIT_STORAGE_BROWSER_EXPORT void NotifyAppCacheDestroyed();
|
| + CONTENT_EXPORT void NotifyAppCacheReady();
|
| + CONTENT_EXPORT void NotifyAppCacheDestroyed();
|
|
|
| // Prior to appcache service being ready, we have to queue
|
| // up reqeusts and defer acting on them until we're ready.
|
| @@ -94,6 +94,6 @@ class AppCacheQuotaClient : public quota::QuotaClient {
|
| DISALLOW_COPY_AND_ASSIGN(AppCacheQuotaClient);
|
| };
|
|
|
| -} // namespace appcache
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
|
| +#endif // CONTENT_BROWSER_APPCACHE_APPCACHE_QUOTA_CLIENT_H_
|
|
|