diff options
Diffstat (limited to 'apps/shell')
| -rw-r--r-- | apps/shell/renderer/shell_content_renderer_client.cc | 49 | ||||
| -rw-r--r-- | apps/shell/renderer/shell_content_renderer_client.h | 3 |
2 files changed, 42 insertions, 10 deletions
diff --git a/apps/shell/renderer/shell_content_renderer_client.cc b/apps/shell/renderer/shell_content_renderer_client.cc index 4e437cc..71cf442 100644 --- a/apps/shell/renderer/shell_content_renderer_client.cc +++ b/apps/shell/renderer/shell_content_renderer_client.cc @@ -7,6 +7,9 @@ #include "apps/shell/common/shell_extensions_client.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/extension_helper.h" +#include "content/public/renderer/render_frame.h" +#include "content/public/renderer/render_frame_observer.h" +#include "content/public/renderer/render_frame_observer_tracker.h" #include "content/public/renderer/render_thread.h" #include "extensions/common/extensions_client.h" @@ -16,6 +19,43 @@ using content::RenderThread; namespace apps { +namespace { + +// TODO: promote ExtensionFrameHelper to a common place and share with this. +class ShellFrameHelper + : public content::RenderFrameObserver, + public content::RenderFrameObserverTracker<ShellFrameHelper> { + public: + ShellFrameHelper(content::RenderFrame* render_frame, + extensions::Dispatcher* extension_dispatcher); + virtual ~ShellFrameHelper(); + + // RenderFrameObserver implementation. + virtual void WillReleaseScriptContext(v8::Handle<v8::Context>, + int world_id) OVERRIDE; + + private: + extensions::Dispatcher* extension_dispatcher_; + + DISALLOW_COPY_AND_ASSIGN(ShellFrameHelper); +}; + +ShellFrameHelper::ShellFrameHelper(content::RenderFrame* render_frame, + extensions::Dispatcher* extension_dispatcher) + : content::RenderFrameObserver(render_frame), + content::RenderFrameObserverTracker<ShellFrameHelper>(render_frame), + extension_dispatcher_(extension_dispatcher) {} + +ShellFrameHelper::~ShellFrameHelper() {} + +void ShellFrameHelper::WillReleaseScriptContext(v8::Handle<v8::Context> context, + int world_id) { + extension_dispatcher_->WillReleaseScriptContext( + render_frame()->GetWebFrame(), context, world_id); +} + +} // namespace + ShellContentRendererClient::ShellContentRendererClient() {} ShellContentRendererClient::~ShellContentRendererClient() {} @@ -35,8 +75,8 @@ void ShellContentRendererClient::RenderThreadStarted() { void ShellContentRendererClient::RenderFrameCreated( content::RenderFrame* render_frame) { - // TODO(jamescook): Create ExtensionFrameHelper? This might be needed for - // Pepper plugins like Flash. + // ShellFrameHelper destroyes itself when the RenderFrame is destroyed. + new ShellFrameHelper(render_frame, extension_dispatcher_.get()); } void ShellContentRendererClient::RenderViewCreated( @@ -61,11 +101,6 @@ void ShellContentRendererClient::DidCreateScriptContext( frame, context, extension_group, world_id); } -void ShellContentRendererClient::WillReleaseScriptContext( - WebFrame* frame, v8::Handle<v8::Context> context, int world_id) { - extension_dispatcher_->WillReleaseScriptContext(frame, context, world_id); -} - bool ShellContentRendererClient::ShouldEnableSiteIsolationPolicy() const { // Extension renderers don't need site isolation. return false; diff --git a/apps/shell/renderer/shell_content_renderer_client.h b/apps/shell/renderer/shell_content_renderer_client.h index 12f9538..4f31225 100644 --- a/apps/shell/renderer/shell_content_renderer_client.h +++ b/apps/shell/renderer/shell_content_renderer_client.h @@ -37,9 +37,6 @@ class ShellContentRendererClient : public content::ContentRendererClient { v8::Handle<v8::Context> context, int extension_group, int world_id) OVERRIDE; - virtual void WillReleaseScriptContext(blink::WebFrame* frame, - v8::Handle<v8::Context> context, - int world_id) OVERRIDE; virtual bool ShouldEnableSiteIsolationPolicy() const OVERRIDE; private: |