diff options
| author | kalman <kalman@chromium.org> | 2015-03-09 15:01:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 22:02:40 +0000 |
| commit | 974a50613d142a86cfa3c94bd9386d05029dabd0 (patch) | |
| tree | 022fc3f3141d295c6d6129a503b95f2743eafaf3 /extensions/shell/renderer | |
| parent | aa5d1b033c0894dfde32bfe0b1d2cd8b2d9a1eb3 (diff) | |
| download | chromium_src-974a50613d142a86cfa3c94bd9386d05029dabd0.zip chromium_src-974a50613d142a86cfa3c94bd9386d05029dabd0.tar.gz chromium_src-974a50613d142a86cfa3c94bd9386d05029dabd0.tar.bz2 | |
Make ContentRendererClient::DidCreateScriptContext take a WebLocalFrame.
Also extensions::Dispatcher::WillReleaseScriptContext.
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/985643004
Cr-Commit-Position: refs/heads/master@{#319739}
Diffstat (limited to 'extensions/shell/renderer')
| -rw-r--r-- | extensions/shell/renderer/shell_content_renderer_client.cc | 2 | ||||
| -rw-r--r-- | extensions/shell/renderer/shell_content_renderer_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/renderer/shell_content_renderer_client.cc b/extensions/shell/renderer/shell_content_renderer_client.cc index 47e3ad4..519079f 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.cc +++ b/extensions/shell/renderer/shell_content_renderer_client.cc @@ -111,7 +111,7 @@ bool ShellContentRendererClient::WillSendRequest( } void ShellContentRendererClient::DidCreateScriptContext( - WebFrame* frame, + blink::WebLocalFrame* frame, v8::Handle<v8::Context> context, int extension_group, int world_id) { diff --git a/extensions/shell/renderer/shell_content_renderer_client.h b/extensions/shell/renderer/shell_content_renderer_client.h index c66dc0a..6b35a12 100644 --- a/extensions/shell/renderer/shell_content_renderer_client.h +++ b/extensions/shell/renderer/shell_content_renderer_client.h @@ -41,7 +41,7 @@ class ShellContentRendererClient : public content::ContentRendererClient { const GURL& url, const GURL& first_party_for_cookies, GURL* new_url) override; - void DidCreateScriptContext(blink::WebFrame* frame, + void DidCreateScriptContext(blink::WebLocalFrame* frame, v8::Handle<v8::Context> context, int extension_group, int world_id) override; |