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

Change AtomRenderFrameObserver.renderer_client_ type to RendererClientBase.

Browse source
This commit is contained in:
Thiago de Arruda 2017-04-08 11:27:19 -03:00
parent ef07e25f9d
commit 72781e38c8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/renderer/atom_render_frame_observer.cc
View file

@ -13,7 +13,7 @@ namespace atom {
AtomRenderFrameObserver::AtomRenderFrameObserver( AtomRenderFrameObserver::AtomRenderFrameObserver(
content::RenderFrame* frame, content::RenderFrame* frame,
AtomRendererClient* renderer_client) RendererClientBase* renderer_client)
: content::RenderFrameObserver(frame), : content::RenderFrameObserver(frame),
render_frame_(frame), render_frame_(frame),
renderer_client_(renderer_client) {} renderer_client_(renderer_client) {}

6
atom/renderer/atom_render_frame_observer.h
View file

@ -5,7 +5,7 @@
#ifndef ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_ #ifndef ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
#define ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_ #define ATOM_RENDERER_ATOM_RENDER_FRAME_OBSERVER_H_
#include "atom/renderer/atom_renderer_client.h" #include "atom/renderer/renderer_client_base.h"
#include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer.h"
namespace atom { namespace atom {
@ -25,7 +25,7 @@ enum ExtensionGroup {
class AtomRenderFrameObserver : public content::RenderFrameObserver { class AtomRenderFrameObserver : public content::RenderFrameObserver {
public: public:
AtomRenderFrameObserver(content::RenderFrame* frame, AtomRenderFrameObserver(content::RenderFrame* frame,
AtomRendererClient* renderer_client); RendererClientBase* renderer_client);
// content::RenderFrameObserver: // content::RenderFrameObserver:
void DidClearWindowObject() override; void DidClearWindowObject() override;
@ -43,7 +43,7 @@ class AtomRenderFrameObserver : public content::RenderFrameObserver {
bool IsIsolatedWorld(int world_id); bool IsIsolatedWorld(int world_id);
content::RenderFrame* render_frame_; content::RenderFrame* render_frame_;
AtomRendererClient* renderer_client_; RendererClientBase* renderer_client_;
DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver); DISALLOW_COPY_AND_ASSIGN(AtomRenderFrameObserver);
}; };