diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 06:04:49 +0000 |
| commit | ca10046545d16cfd705fbfc356d97710f47cedee (patch) | |
| tree | 66d60515921d0229911b12c318b39bfda2c2e00b /webkit/appcache/appcache_host.cc | |
| parent | 71aaa7aa371e39947d951addfcdf32f2cda353ac (diff) | |
| download | chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.zip chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.gz chromium_src-ca10046545d16cfd705fbfc356d97710f47cedee.tar.bz2 | |
Failed compile on Chromium builder dbg
Revert 52072 - Pass notifications to the browser on access to the appcache main resource manifest.
BUG=45230
TEST=browser_tests
Review URL: http://codereview.chromium.org/2808046
TBR=jochen@chromium.org
Review URL: http://codereview.chromium.org/2925008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_host.cc')
| -rw-r--r-- | webkit/appcache/appcache_host.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/webkit/appcache/appcache_host.cc b/webkit/appcache/appcache_host.cc index 7b9e58d..8553324 100644 --- a/webkit/appcache/appcache_host.cc +++ b/webkit/appcache/appcache_host.cc @@ -48,8 +48,7 @@ void AppCacheHost::SelectCache(const GURL& document_url, !pending_get_status_callback_); if (main_resource_blocked_) - frontend_->OnContentBlocked(host_id_, - blocked_manifest_url_); + frontend_->OnContentBlocked(host_id_); // First we handle an unusual case of SelectCache being called a second // time. Generally this shouldn't happen, but with bad content I think @@ -380,7 +379,7 @@ void AppCacheHost::OnUpdateComplete(AppCacheGroup* group) { } void AppCacheHost::OnContentBlocked(AppCacheGroup* group) { - frontend_->OnContentBlocked(host_id_, group->manifest_url()); + frontend_->OnContentBlocked(host_id_); } void AppCacheHost::SetSwappableCache(AppCacheGroup* group) { @@ -405,9 +404,8 @@ void AppCacheHost::LoadMainResourceCache(int64 cache_id) { service_->storage()->LoadCache(cache_id, this); } -void AppCacheHost::NotifyMainResourceBlocked(const GURL& manifest_url) { +void AppCacheHost::NotifyMainResourceBlocked() { main_resource_blocked_ = true; - blocked_manifest_url_ = manifest_url; } void AppCacheHost::AssociateCache(AppCache* cache) { |