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

Move EmitIPCEvent into AtomRenderViewObserver.

Browse source 
Refactor this function as a method so it is possible to inherit most behavior
from AtomRenderViewObserver and override EmitIPCEvent.
This commit is contained in:
Thiago de Arruda 2016-08-20 12:01:26 -03:00
parent c8629019f5
commit 6afe8aa7f2
2 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
atom/renderer/atom_render_view_observer.cc
View file

@ -59,9 +59,33 @@ std::vector<v8::Local<v8::Value>> ListValueToVector(
return result; return result;
} }
void EmitIPCEvent(blink::WebFrame* frame, base::StringPiece NetResourceProvider(int key) {
const base::string16& channel, if (key == IDR_DIR_HEADER_HTML) {
const base::ListValue& args) { base::StringPiece html_data =
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_DIR_HEADER_HTML);
return html_data;
}
return base::StringPiece();
}
} // namespace
AtomRenderViewObserver::AtomRenderViewObserver(
content::RenderView* render_view,
AtomRendererClient* renderer_client)
: content::RenderViewObserver(render_view),
document_created_(false) {
// Initialise resource for directory listing.
net::NetModule::SetResourceProvider(NetResourceProvider);
}
AtomRenderViewObserver::~AtomRenderViewObserver() {
}
void AtomRenderViewObserver::EmitIPCEvent(blink::WebFrame* frame,
const base::string16& channel,
const base::ListValue& args) {
if (!frame || frame->isWebRemoteFrame()) if (!frame || frame->isWebRemoteFrame())
return; return;
@ -87,30 +111,6 @@ void EmitIPCEvent(blink::WebFrame* frame,
} }
} }
base::StringPiece NetResourceProvider(int key) {
if (key == IDR_DIR_HEADER_HTML) {
base::StringPiece html_data =
ui::ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_DIR_HEADER_HTML);
return html_data;
}
return base::StringPiece();
}
} // namespace
AtomRenderViewObserver::AtomRenderViewObserver(
content::RenderView* render_view,
AtomRendererClient* renderer_client)
: content::RenderViewObserver(render_view),
document_created_(false) {
// Initialise resource for directory listing.
net::NetModule::SetResourceProvider(NetResourceProvider);
}
AtomRenderViewObserver::~AtomRenderViewObserver() {
}
void AtomRenderViewObserver::DidCreateDocumentElement( void AtomRenderViewObserver::DidCreateDocumentElement(
blink::WebLocalFrame* frame) { blink::WebLocalFrame* frame) {
document_created_ = true; document_created_ = true;

5
atom/renderer/atom_render_view_observer.h
View file

@ -7,6 +7,7 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/public/web/WebFrame.h"
namespace base { namespace base {
class ListValue; class ListValue;
@ -24,6 +25,10 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
protected: protected:
virtual ~AtomRenderViewObserver(); virtual ~AtomRenderViewObserver();
virtual void EmitIPCEvent(blink::WebFrame* frame,
const base::string16& channel,
const base::ListValue& args);
private: private:
// content::RenderViewObserver implementation. // content::RenderViewObserver implementation.
void DidCreateDocumentElement(blink::WebLocalFrame* frame) override; void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;