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