Chromium Code Reviews| Index: android_webview/renderer/aw_render_view_ext.cc |
| diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc |
| index ae0035dbe8c28010e170799ddae4f2b440739b38..7171077f3b84bdf1fa305f127dbcff0d7f417223 100644 |
| --- a/android_webview/renderer/aw_render_view_ext.cc |
| +++ b/android_webview/renderer/aw_render_view_ext.cc |
| @@ -4,18 +4,21 @@ |
| #include "android_webview/renderer/aw_render_view_ext.h" |
| +#include "android_webview/common/aw_utils.h" |
| #include "android_webview/common/render_view_messages.h" |
| #include "content/public/renderer/render_view.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| +#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| -#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
| namespace android_webview { |
| AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view) |
| : content::RenderViewObserver(render_view) { |
| + render_view->GetWebView()->setPermissionClient(this); |
| } |
| AwRenderViewExt::~AwRenderViewExt() {} |
| @@ -48,4 +51,14 @@ void AwRenderViewExt::OnDocumentHasImagesRequest(int id) { |
| hasImages)); |
| } |
| +bool AwRenderViewExt::allowImage(WebKit::WebFrame* frame, |
| + bool enabledPerSettings, |
| + const WebKit::WebURL& imageURL) { |
| + // Implementing setBlockNetworkImages, so allow local scheme images to be |
| + // loaded. |
| + if (enabledPerSettings || isLocalScheme(GURL(imageURL))) |
|
mnaganov (inactive)
2012/09/25 09:55:53
Perhaps, simplify as 'return enabledPerSettings...
boliu
2012/09/25 16:55:12
Done.
|
| + return true; |
| + return false; |
| +} |
| + |
| } // namespace android_webview |