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 /chrome/browser/renderer_host | |
| 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 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.cc | 10 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.h | 1 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host_delegate.h | 7 |
3 files changed, 18 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 4905ad5..92c2182 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -835,6 +835,7 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents) IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated) IPC_MESSAGE_HANDLER(ViewHostMsg_ContentBlocked, OnContentBlocked) + IPC_MESSAGE_HANDLER(ViewHostMsg_AppCacheAccessed, OnAppCacheAccessed) IPC_MESSAGE_HANDLER(ViewHostMsg_WebDatabaseAccessed, OnWebDatabaseAccessed) IPC_MESSAGE_HANDLER(ViewHostMsg_AccessibilityTree, OnAccessibilityTree) IPC_MESSAGE_HANDLER(ViewHostMsg_FocusedNodeChanged, OnMsgFocusedNodeChanged) @@ -1931,6 +1932,15 @@ void RenderViewHost::OnContentBlocked(ContentSettingsType type) { content_settings_delegate->OnContentBlocked(type); } +void RenderViewHost::OnAppCacheAccessed(const GURL& manifest_url, + bool blocked_by_policy) { + RenderViewHostDelegate::ContentSettings* content_settings_delegate = + delegate_->GetContentSettingsDelegate(); + if (content_settings_delegate) + content_settings_delegate->OnAppCacheAccessed(manifest_url, + blocked_by_policy); +} + void RenderViewHost::OnWebDatabaseAccessed(const GURL& url, const string16& name, const string16& display_name, diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 25d3c15..c62f6ce 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -640,6 +640,7 @@ class RenderViewHost : public RenderWidgetHost { const std::string& translated_lang, TranslateErrors::Type error_type); void OnContentBlocked(ContentSettingsType type); + void OnAppCacheAccessed(const GURL& manifest_url, bool blocked_by_policy); void OnWebDatabaseAccessed(const GURL& url, const string16& name, const string16& display_name, diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index a0728a2..a5fca32 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -342,6 +342,13 @@ class RenderViewHostDelegate { unsigned long estimated_size, bool blocked_by_policy) = 0; + // Called when a specific appcache in the current page was accessed. If + // access was blocked due to the user's content settings, + // |blocked_by_policy| should eb true, and this function should invoke + // OnContentBlocked. + virtual void OnAppCacheAccessed(const GURL& manifest_url, + bool blocked_by_policy) = 0; + // Called when geolocation permission was set in a frame on the current // page. virtual void OnGeolocationPermissionSet(const GURL& requesting_frame, |