Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>...

WebKit/chromium/public/WebFrameClient.h

Index: WebKit/chromium/public/WebFrameClient.h
===================================================================
--- WebKit/chromium/public/WebFrameClient.h	(revision 68288)
+++ WebKit/chromium/public/WebFrameClient.h	(working copy)
@@ -301,7 +301,14 @@
     // scripts.
     virtual void didCreateIsolatedScriptContext(WebFrame*) { }
 
+    // Controls whether the given script extension should run in a new script
+    // context in this frame. If extensionGroup is 0, the script context is the
+    // frame's main context. Otherwise, it is a context created by
+    // WebFrame::executeScriptInIsolatedWorld with that same extensionGroup
+    // value.
+    virtual bool allowScriptExtension(WebFrame*, const WebString& extensionName, int extensionGroup) { return true; }
 
+
     // Geometry notifications ----------------------------------------------
 
     // The frame's document finished the initial layout of a page.