| Index: content/browser/appcache/appcache_service_impl.cc
|
| diff --git a/content/browser/appcache/appcache_service_impl.cc b/content/browser/appcache/appcache_service_impl.cc
|
| index 97a05586816e4016a1138f0e04f6a3945ecb712d..0c784dfd3dcc5572e36825f9d0880d1357c04ae2 100644
|
| --- a/content/browser/appcache/appcache_service_impl.cc
|
| +++ b/content/browser/appcache/appcache_service_impl.cc
|
| @@ -51,7 +51,7 @@ class AppCacheServiceImpl::AsyncHelper
|
| service_->pending_helpers_.insert(this);
|
| }
|
|
|
| - virtual ~AsyncHelper() {
|
| + ~AsyncHelper() override {
|
| if (service_)
|
| service_->pending_helpers_.erase(this);
|
| }
|
| @@ -94,7 +94,7 @@ class AppCacheServiceImpl::CanHandleOfflineHelper : AsyncHelper {
|
| first_party_(first_party) {
|
| }
|
|
|
| - virtual void Start() override {
|
| + void Start() override {
|
| AppCachePolicy* policy = service_->appcache_policy();
|
| if (policy && !policy->CanLoadAppCache(url_, first_party_)) {
|
| CallCallback(net::ERR_FAILED);
|
| @@ -107,10 +107,13 @@ class AppCacheServiceImpl::CanHandleOfflineHelper : AsyncHelper {
|
|
|
| private:
|
| // AppCacheStorage::Delegate implementation.
|
| - virtual void OnMainResponseFound(
|
| - const GURL& url, const AppCacheEntry& entry,
|
| - const GURL& fallback_url, const AppCacheEntry& fallback_entry,
|
| - int64 cache_id, int64 group_id, const GURL& mainfest_url) override;
|
| + void OnMainResponseFound(const GURL& url,
|
| + const AppCacheEntry& entry,
|
| + const GURL& fallback_url,
|
| + const AppCacheEntry& fallback_entry,
|
| + int64 cache_id,
|
| + int64 group_id,
|
| + const GURL& mainfest_url) override;
|
|
|
| GURL url_;
|
| GURL first_party_;
|
| @@ -137,17 +140,16 @@ class AppCacheServiceImpl::DeleteHelper : public AsyncHelper {
|
| : AsyncHelper(service, callback), manifest_url_(manifest_url) {
|
| }
|
|
|
| - virtual void Start() override {
|
| + void Start() override {
|
| service_->storage()->LoadOrCreateGroup(manifest_url_, this);
|
| }
|
|
|
| private:
|
| // AppCacheStorage::Delegate implementation.
|
| - virtual void OnGroupLoaded(
|
| - AppCacheGroup* group, const GURL& manifest_url) override;
|
| - virtual void OnGroupMadeObsolete(AppCacheGroup* group,
|
| - bool success,
|
| - int response_code) override;
|
| + void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url) override;
|
| + void OnGroupMadeObsolete(AppCacheGroup* group,
|
| + bool success,
|
| + int response_code) override;
|
|
|
| GURL manifest_url_;
|
| DISALLOW_COPY_AND_ASSIGN(DeleteHelper);
|
| @@ -184,19 +186,18 @@ class AppCacheServiceImpl::DeleteOriginHelper : public AsyncHelper {
|
| num_caches_to_delete_(0), successes_(0), failures_(0) {
|
| }
|
|
|
| - virtual void Start() override {
|
| + void Start() override {
|
| // We start by listing all caches, continues in OnAllInfo().
|
| service_->storage()->GetAllInfo(this);
|
| }
|
|
|
| private:
|
| // AppCacheStorage::Delegate implementation.
|
| - virtual void OnAllInfo(AppCacheInfoCollection* collection) override;
|
| - virtual void OnGroupLoaded(
|
| - AppCacheGroup* group, const GURL& manifest_url) override;
|
| - virtual void OnGroupMadeObsolete(AppCacheGroup* group,
|
| - bool success,
|
| - int response_code) override;
|
| + void OnAllInfo(AppCacheInfoCollection* collection) override;
|
| + void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url) override;
|
| + void OnGroupMadeObsolete(AppCacheGroup* group,
|
| + bool success,
|
| + int response_code) override;
|
|
|
| void CacheCompleted(bool success);
|
|
|
| @@ -278,13 +279,11 @@ class AppCacheServiceImpl::GetInfoHelper : AsyncHelper {
|
| : AsyncHelper(service, callback), collection_(collection) {
|
| }
|
|
|
| - virtual void Start() override {
|
| - service_->storage()->GetAllInfo(this);
|
| - }
|
| + void Start() override { service_->storage()->GetAllInfo(this); }
|
|
|
| private:
|
| // AppCacheStorage::Delegate implementation.
|
| - virtual void OnAllInfo(AppCacheInfoCollection* collection) override;
|
| + void OnAllInfo(AppCacheInfoCollection* collection) override;
|
|
|
| scoped_refptr<AppCacheInfoCollection> collection_;
|
|
|
| @@ -316,11 +315,11 @@ class AppCacheServiceImpl::CheckResponseHelper : AsyncHelper {
|
| amount_data_read_(0) {
|
| }
|
|
|
| - virtual void Start() override {
|
| + void Start() override {
|
| service_->storage()->LoadOrCreateGroup(manifest_url_, this);
|
| }
|
|
|
| - virtual void Cancel() override {
|
| + void Cancel() override {
|
| AppCacheHistograms::CountCheckResponseResult(
|
| AppCacheHistograms::CHECK_CANCELED);
|
| response_reader_.reset();
|
| @@ -328,8 +327,7 @@ class AppCacheServiceImpl::CheckResponseHelper : AsyncHelper {
|
| }
|
|
|
| private:
|
| - virtual void OnGroupLoaded(AppCacheGroup* group,
|
| - const GURL& manifest_url) override;
|
| + void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url) override;
|
| void OnReadInfoComplete(int result);
|
| void OnReadDataComplete(int result);
|
|
|
|
|