From 6afe8aa7f2765cfcb2553651b0fc11dcce948eca Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Sat, 20 Aug 2016 12:01:26 -0300
Subject: [PATCH] Move EmitIPCEvent into AtomRenderViewObserver.

Refactor this function as a method so it is possible to inherit most behavior
from AtomRenderViewObserver and override EmitIPCEvent.
---
 atom/renderer/atom_render_view_observer.cc | 54 +++++++++++-----------
 atom/renderer/atom_render_view_observer.h  |  5 ++
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/atom/renderer/atom_render_view_observer.cc b/atom/renderer/atom_render_view_observer.cc
index 0db68e14dc44..4600cf9abdd9 100644
--- a/atom/renderer/atom_render_view_observer.cc
+++ b/atom/renderer/atom_render_view_observer.cc
@@ -59,9 +59,33 @@ std::vector<v8::Local<v8::Value>> ListValueToVector(
   return result;
 }
 
-void EmitIPCEvent(blink::WebFrame* frame,
-                  const base::string16& channel,
-                  const base::ListValue& args) {
+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::EmitIPCEvent(blink::WebFrame* frame,
+                                          const base::string16& channel,
+                                          const base::ListValue& args) {
   if (!frame || frame->isWebRemoteFrame())
     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(
     blink::WebLocalFrame* frame) {
   document_created_ = true;
diff --git a/atom/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h
index 76b05cd19ec9..ce426060b660 100644
--- a/atom/renderer/atom_render_view_observer.h
+++ b/atom/renderer/atom_render_view_observer.h
@@ -7,6 +7,7 @@
 
 #include "base/strings/string16.h"
 #include "content/public/renderer/render_view_observer.h"
+#include "third_party/WebKit/public/web/WebFrame.h"
 
 namespace base {
 class ListValue;
@@ -24,6 +25,10 @@ class AtomRenderViewObserver : public content::RenderViewObserver {
  protected:
   virtual ~AtomRenderViewObserver();
 
+  virtual void EmitIPCEvent(blink::WebFrame* frame,
+                            const base::string16& channel,
+                            const base::ListValue& args);
+
  private:
   // content::RenderViewObserver implementation.
   void DidCreateDocumentElement(blink::WebLocalFrame* frame) override;