api::EventEmitter could also be used by renderer.

browser/api/atom_api_app.h

@@ -6,8 +6,8 @@
 #define ATOM_BROWSER_API_ATOM_API_APP_H_
 
 #include "base/compiler_specific.h"
-#include "browser/api/atom_api_event_emitter.h"
 #include "browser/browser_observer.h"
+#include "common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_auto_updater.h

@@ -7,8 +7,8 @@
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "browser/api/atom_api_event_emitter.h"
 #include "browser/auto_updater_delegate.h"
+#include "common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_event_emitter.cc

@@ -1,71 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "browser/api/atom_api_event_emitter.h"
-
-#include <vector>
-
-#include "base/logging.h"
-#include "browser/api/atom_api_event.h"
-#include "common/v8/native_type_conversions.h"
-
-#include "common/v8/node_common.h"
-
-namespace atom {
-
-namespace api {
-
-EventEmitter::EventEmitter(v8::Handle<v8::Object> wrapper) {
-  Wrap(wrapper);
-}
-
-EventEmitter::~EventEmitter() {
-  // Clear the aligned pointer, it should have been done by ObjectWrap but
-  // somehow node v0.11.x changed this behaviour.
-  v8::HandleScope handle_scope(node_isolate);
-  handle()->SetAlignedPointerInInternalField(0, NULL);
-}
-
-bool EventEmitter::Emit(const std::string& name) {
-  base::ListValue args;
-  return Emit(name, &args);
-}
-
-bool EventEmitter::Emit(const std::string& name, base::ListValue* args) {
-  v8::HandleScope handle_scope(node_isolate);
-
-  v8::Handle<v8::Context> context = v8::Context::GetCurrent();
-  scoped_ptr<V8ValueConverter> converter(new V8ValueConverter);
-
-  v8::Handle<v8::Object> v8_event = Event::CreateV8Object();
-  Event* event = Event::Unwrap<Event>(v8_event);
-
-  // Generate arguments for calling handle.emit.
-  std::vector<v8::Handle<v8::Value>> v8_args;
-  v8_args.reserve(args->GetSize() + 2);
-  v8_args.push_back(ToV8Value(name));
-  v8_args.push_back(v8_event);
-  for (size_t i = 0; i < args->GetSize(); i++) {
-    base::Value* value = NULL;
-    if (args->Get(i, &value)) {
-      DCHECK(value);
-      v8_args.push_back(converter->ToV8Value(value, context));
-    } else {
-      NOTREACHED() << "Wrong offset " << i << " for " << *args;
-    }
-  }
-
-  node::MakeCallback(handle(), "emit", v8_args.size(), &v8_args[0]);
-
-  bool prevent_default = event->prevent_default();
-
-  // Don't wait for V8 GC, delete it immediately.
-  delete event;
-
-  return prevent_default;
-}
-
-}  // namespace api
-
-}  // namespace atom

browser/api/atom_api_event_emitter.h

@@ -1,43 +0,0 @@
-// Copyright (c) 2013 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_API_ATOM_API_EVENT_EMITTER_H_
-#define ATOM_BROWSER_API_ATOM_API_EVENT_EMITTER_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "vendor/node/src/node_object_wrap.h"
-
-namespace base {
-class ListValue;
-}
-
-namespace atom {
-
-namespace api {
-
-// Class interiting EventEmitter should assume it's a javascript object which
-// interits require('events').EventEmitter, this class provides many helper
-// methods to do event processing in C++.
-class EventEmitter : public node::ObjectWrap {
- public:
-  virtual ~EventEmitter();
-
-  // Emit an event and returns whether the handler has called preventDefault().
-  bool Emit(const std::string& name);
-  bool Emit(const std::string& name, base::ListValue* args);
-
- protected:
-  explicit EventEmitter(v8::Handle<v8::Object> wrapper);
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(EventEmitter);
-};
-
-}  // namespace api
-
-}  // namespace atom
-
-#endif  // ATOM_BROWSER_API_ATOM_API_EVENT_EMITTER_H_

browser/api/atom_api_menu.h

@@ -6,7 +6,7 @@
 #define ATOM_BROWSER_API_ATOM_API_MENU_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "browser/api/atom_api_event_emitter.h"
+#include "common/api/atom_api_event_emitter.h"
 #include "ui/base/models/simple_menu_model.h"
 
 namespace atom {

browser/api/atom_api_power_monitor.h

@@ -5,10 +5,9 @@
 #ifndef ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 #define ATOM_BROWSER_API_ATOM_API_POWER_MONITOR_H_
 
-#include "browser/api/atom_api_event_emitter.h"
-
 #include "base/compiler_specific.h"
 #include "base/power_monitor/power_observer.h"
+#include "common/api/atom_api_event_emitter.h"
 
 namespace atom {
 

browser/api/atom_api_window.h

@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "browser/api/atom_api_event_emitter.h"
 #include "browser/native_window_observer.h"
+#include "common/api/atom_api_event_emitter.h"
 #include "common/v8/scoped_persistent.h"
 
 namespace base {