| Index: content/browser/appcache/appcache_service_impl.cc
|
| diff --git a/webkit/browser/appcache/appcache_service_impl.cc b/content/browser/appcache/appcache_service_impl.cc
|
| similarity index 93%
|
| rename from webkit/browser/appcache/appcache_service_impl.cc
|
| rename to content/browser/appcache/appcache_service_impl.cc
|
| index 3091a5cb5fabc4d2dad69303e06668de25cb2e2c..6c3f0fdf179ab598cc9064cbc1d0728498037b90 100644
|
| --- a/webkit/browser/appcache/appcache_service_impl.cc
|
| +++ b/content/browser/appcache/appcache_service_impl.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/appcache/appcache_service_impl.h"
|
| +#include "content/browser/appcache/appcache_service_impl.h"
|
|
|
| #include <functional>
|
|
|
| @@ -11,21 +11,21 @@
|
| #include "base/logging.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/stl_util.h"
|
| +#include "content/browser/appcache/appcache.h"
|
| +#include "content/browser/appcache/appcache_backend_impl.h"
|
| +#include "content/browser/appcache/appcache_entry.h"
|
| +#include "content/browser/appcache/appcache_executable_handler.h"
|
| +#include "content/browser/appcache/appcache_histograms.h"
|
| +#include "content/browser/appcache/appcache_policy.h"
|
| +#include "content/browser/appcache/appcache_quota_client.h"
|
| +#include "content/browser/appcache/appcache_response.h"
|
| +#include "content/browser/appcache/appcache_service_impl.h"
|
| +#include "content/browser/appcache/appcache_storage_impl.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/io_buffer.h"
|
| -#include "webkit/browser/appcache/appcache.h"
|
| -#include "webkit/browser/appcache/appcache_backend_impl.h"
|
| -#include "webkit/browser/appcache/appcache_entry.h"
|
| -#include "webkit/browser/appcache/appcache_executable_handler.h"
|
| -#include "webkit/browser/appcache/appcache_histograms.h"
|
| -#include "webkit/browser/appcache/appcache_policy.h"
|
| -#include "webkit/browser/appcache/appcache_quota_client.h"
|
| -#include "webkit/browser/appcache/appcache_response.h"
|
| -#include "webkit/browser/appcache/appcache_service_impl.h"
|
| -#include "webkit/browser/appcache/appcache_storage_impl.h"
|
| #include "webkit/browser/quota/special_storage_policy.h"
|
|
|
| -namespace appcache {
|
| +namespace content {
|
|
|
| namespace {
|
|
|
| @@ -143,8 +143,8 @@ class AppCacheServiceImpl::DeleteHelper : public AsyncHelper {
|
| private:
|
| // AppCacheStorage::Delegate implementation.
|
| virtual void OnGroupLoaded(
|
| - appcache::AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
|
| - virtual void OnGroupMadeObsolete(appcache::AppCacheGroup* group,
|
| + AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
|
| + virtual void OnGroupMadeObsolete(AppCacheGroup* group,
|
| bool success,
|
| int response_code) OVERRIDE;
|
|
|
| @@ -153,7 +153,7 @@ class AppCacheServiceImpl::DeleteHelper : public AsyncHelper {
|
| };
|
|
|
| void AppCacheServiceImpl::DeleteHelper::OnGroupLoaded(
|
| - appcache::AppCacheGroup* group, const GURL& manifest_url) {
|
| + AppCacheGroup* group, const GURL& manifest_url) {
|
| if (group) {
|
| group->set_being_deleted(true);
|
| group->CancelUpdate();
|
| @@ -165,7 +165,7 @@ void AppCacheServiceImpl::DeleteHelper::OnGroupLoaded(
|
| }
|
|
|
| void AppCacheServiceImpl::DeleteHelper::OnGroupMadeObsolete(
|
| - appcache::AppCacheGroup* group,
|
| + AppCacheGroup* group,
|
| bool success,
|
| int response_code) {
|
| CallCallback(success ? net::OK : net::ERR_FAILED);
|
| @@ -192,8 +192,8 @@ class AppCacheServiceImpl::DeleteOriginHelper : public AsyncHelper {
|
| // AppCacheStorage::Delegate implementation.
|
| virtual void OnAllInfo(AppCacheInfoCollection* collection) OVERRIDE;
|
| virtual void OnGroupLoaded(
|
| - appcache::AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
|
| - virtual void OnGroupMadeObsolete(appcache::AppCacheGroup* group,
|
| + AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
|
| + virtual void OnGroupMadeObsolete(AppCacheGroup* group,
|
| bool success,
|
| int response_code) OVERRIDE;
|
|
|
| @@ -237,7 +237,7 @@ void AppCacheServiceImpl::DeleteOriginHelper::OnAllInfo(
|
| }
|
|
|
| void AppCacheServiceImpl::DeleteOriginHelper::OnGroupLoaded(
|
| - appcache::AppCacheGroup* group, const GURL& manifest_url) {
|
| + AppCacheGroup* group, const GURL& manifest_url) {
|
| if (group) {
|
| group->set_being_deleted(true);
|
| group->CancelUpdate();
|
| @@ -248,7 +248,7 @@ void AppCacheServiceImpl::DeleteOriginHelper::OnGroupLoaded(
|
| }
|
|
|
| void AppCacheServiceImpl::DeleteOriginHelper::OnGroupMadeObsolete(
|
| - appcache::AppCacheGroup* group,
|
| + AppCacheGroup* group,
|
| bool success,
|
| int response_code) {
|
| CacheCompleted(success);
|
| @@ -575,4 +575,4 @@ void AppCacheServiceImpl::UnregisterBackend(
|
| backends_.erase(backend_impl->process_id());
|
| }
|
|
|
| -} // namespace appcache
|
| +} // namespace content
|
|
|