summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
authorkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 05:52:58 +0000
committerkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-27 05:52:58 +0000
commita00fe69ddb6d23223472ae5d52451f9b2140ad25 (patch)
tree7a3ab655f51232e630579d376f55ba3a546cb01f /content/shell
parentb40d5cb10fb3f094033083d060397898eaaa022a (diff)
downloadchromium_src-a00fe69ddb6d23223472ae5d52451f9b2140ad25.zip
chromium_src-a00fe69ddb6d23223472ae5d52451f9b2140ad25.tar.gz
chromium_src-a00fe69ddb6d23223472ae5d52451f9b2140ad25.tar.bz2
Add new versions of DidCreateScriptContext() with extension_group.
This is the first of a two part change to plumb the extension_group parameter from WebKit into ExtensionDispatcher::DidCreateScriptContext(). BUG= TEST=chrome still compiles Review URL: http://codereview.chromium.org/9395071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell_content_renderer_client.cc3
-rw-r--r--content/shell/shell_content_renderer_client.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index 1cbdee5c..2bcb24e 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -95,7 +95,8 @@ bool ShellContentRendererClient::ShouldPumpEventsDuringCookieMessage() {
}
void ShellContentRendererClient::DidCreateScriptContext(
- WebKit::WebFrame* frame, v8::Handle<v8::Context> context, int world_id) {
+ WebKit::WebFrame* frame, v8::Handle<v8::Context> context,
+ int extension_group, int world_id) {
}
void ShellContentRendererClient::WillReleaseScriptContext(
diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h
index d02deb3..a28f4f0 100644
--- a/content/shell/shell_content_renderer_client.h
+++ b/content/shell/shell_content_renderer_client.h
@@ -57,6 +57,7 @@ class ShellContentRendererClient : public ContentRendererClient {
virtual bool ShouldPumpEventsDuringCookieMessage() OVERRIDE;
virtual void DidCreateScriptContext(WebKit::WebFrame* frame,
v8::Handle<v8::Context> context,
+ int extension_group,
int world_id) OVERRIDE;
virtual void WillReleaseScriptContext(WebKit::WebFrame* frame,
v8::Handle<v8::Context> context,