diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 07:02:14 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 07:02:14 +0000 |
| commit | a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964 (patch) | |
| tree | 30dae575da36ab840a604a9b1eb374c8efd063ad /android_webview | |
| parent | ac55bfed12187c54c18152e54ddcec14d486b740 (diff) | |
| download | chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.zip chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.tar.gz chromium_src-a5ac6dcaca8e8e69d8ec8156853cbe035fdb4964.tar.bz2 | |
Now that RenderFrame is 1:1 with WebFrame, add the associated getters and start cleaning up assumptions.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/138333006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_permission_client.cc | 8 | ||||
| -rw-r--r-- | android_webview/renderer/aw_permission_client.h | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/android_webview/renderer/aw_permission_client.cc b/android_webview/renderer/aw_permission_client.cc index 6272b33..d6ebf65 100644 --- a/android_webview/renderer/aw_permission_client.cc +++ b/android_webview/renderer/aw_permission_client.cc @@ -4,6 +4,7 @@ #include "android_webview/renderer/aw_permission_client.h" +#include "content/public/renderer/render_frame.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "url/gurl.h" @@ -24,16 +25,13 @@ bool AllowMixedContent(const blink::WebURL& url) { } AwPermissionClient::AwPermissionClient(content::RenderFrame* render_frame) - : content::RenderFrameObserver(render_frame){ + : content::RenderFrameObserver(render_frame) { + render_frame->GetWebFrame()->setPermissionClient(this); } AwPermissionClient::~AwPermissionClient() { } -void AwPermissionClient::WebFrameCreated(blink::WebFrame* frame) { - frame->setPermissionClient(this); -} - bool AwPermissionClient::allowDisplayingInsecureContent( blink::WebFrame* frame, bool enabled_per_settings, diff --git a/android_webview/renderer/aw_permission_client.h b/android_webview/renderer/aw_permission_client.h index 2fb1510..6548553 100644 --- a/android_webview/renderer/aw_permission_client.h +++ b/android_webview/renderer/aw_permission_client.h @@ -19,9 +19,6 @@ class AwPermissionClient : public content::RenderFrameObserver, private: virtual ~AwPermissionClient(); - // content::RenderFrameObserver implementation. - virtual void WebFrameCreated(blink::WebFrame* frame) OVERRIDE; - // blink::WebPermissionClient implementation. virtual bool allowDisplayingInsecureContent( blink::WebFrame* frame, |