diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 06:49:16 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-19 06:49:16 +0000 |
commit | 9829cb193889ec9adad7f03c8593e9dd49a8bb61 (patch) | |
tree | 6605ad32a7b30ea3c4cf994a7e1dc8762394d996 /chrome/renderer/content_settings_observer.cc | |
parent | 62466568bdf7017ff508f062a4e19f9f3b3069e8 (diff) | |
download | chromium_src-9829cb193889ec9adad7f03c8593e9dd49a8bb61.zip chromium_src-9829cb193889ec9adad7f03c8593e9dd49a8bb61.tar.gz chromium_src-9829cb193889ec9adad7f03c8593e9dd49a8bb61.tar.bz2 |
Update WebPermissionClient implementation to support image URLs
BUG=none
TEST=still works
Review URL: http://codereview.chromium.org/7931020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/content_settings_observer.cc')
-rw-r--r-- | chrome/renderer/content_settings_observer.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc index c89482e..8383fa4 100644 --- a/chrome/renderer/content_settings_observer.cc +++ b/chrome/renderer/content_settings_observer.cc @@ -15,6 +15,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" using WebKit::WebDataSource; @@ -22,6 +23,7 @@ using WebKit::WebFrame; using WebKit::WebFrameClient; using WebKit::WebSecurityOrigin; using WebKit::WebString; +using WebKit::WebURL; using WebKit::WebView; namespace { @@ -194,8 +196,9 @@ bool ContentSettingsObserver::AllowFileSystem(WebFrame* frame) { return result; } -bool ContentSettingsObserver::AllowImages(WebFrame* frame, - bool enabled_per_settings) { +bool ContentSettingsObserver::AllowImage(WebFrame* frame, + bool enabled_per_settings, + const WebURL& image_url) { if (enabled_per_settings && AllowContentType(CONTENT_SETTINGS_TYPE_IMAGES)) { return true; |