mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Move node integration from RenderViewObserver to RendererClient.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-23 22:08:45 +08:00
parent 02d94c8b2e
commit df0094b6cb
6 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
renderer/atom_render_view_observer.h
View file

@ -5,7 +5,6 @@
#ifndef ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_
#define ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_
#include "base/memory/scoped_ptr.h"
#include "content/public/renderer/render_view_observer.h"
namespace base {
@ -14,21 +13,16 @@ class ListValue;
namespace atom {
class AtomRendererBindings;
class AtomRendererClient;
class AtomRenderViewObserver : content::RenderViewObserver {
class AtomRenderViewObserver : public content::RenderViewObserver {
public:
explicit AtomRenderViewObserver(content::RenderView* render_view,
AtomRendererClient* renderer_client);
AtomRendererBindings* atom_bindings() const { return atom_bindings_.get(); }
protected:
virtual ~AtomRenderViewObserver();
virtual void DidClearWindowObject(WebKit::WebFrame*) OVERRIDE;
private:
// content::RenderViewObserver implementation.
virtual void DraggableRegionsChanged(WebKit::WebFrame* frame) OVERRIDE;
@ -37,8 +31,6 @@ class AtomRenderViewObserver : content::RenderViewObserver {
void OnBrowserMessage(const string16& channel,
const base::ListValue& args);
scoped_ptr<AtomRendererBindings> atom_bindings_;
// Weak reference to renderer client.
AtomRendererClient* renderer_client_;