From cf4616de7f5fb1de5f3b79e1001230330a5ca333 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Tue, 7 Jan 2014 19:32:40 +0800
Subject: [PATCH] api::EventEmitter could also be used by renderer.

---
 atom.gyp                                          | 4 ++--
 browser/api/atom_api_app.h                        | 2 +-
 browser/api/atom_api_auto_updater.h               | 2 +-
 browser/api/atom_api_menu.h                       | 2 +-
 browser/api/atom_api_power_monitor.h              | 3 +--
 browser/api/atom_api_window.h                     | 2 +-
 {browser => common}/api/atom_api_event_emitter.cc | 2 +-
 {browser => common}/api/atom_api_event_emitter.h  | 6 +++---
 8 files changed, 11 insertions(+), 12 deletions(-)
 rename {browser => common}/api/atom_api_event_emitter.cc (97%)
 rename {browser => common}/api/atom_api_event_emitter.h (85%)

diff --git a/atom.gyp b/atom.gyp
index 0d070f9a8eda..c1d0b8ebbd82 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -47,8 +47,6 @@
       'browser/api/atom_api_dialog.h',
       'browser/api/atom_api_event.cc',
       'browser/api/atom_api_event.h',
-      'browser/api/atom_api_event_emitter.cc',
-      'browser/api/atom_api_event_emitter.h',
       'browser/api/atom_api_menu.cc',
       'browser/api/atom_api_menu.h',
       'browser/api/atom_api_menu_mac.h',
@@ -131,6 +129,8 @@
       'common/api/atom_api_clipboard.h',
       'common/api/atom_api_crash_reporter.cc',
       'common/api/atom_api_crash_reporter.h',
+      'common/api/atom_api_event_emitter.cc',
+      'common/api/atom_api_event_emitter.h',
       'common/api/atom_api_id_weak_map.cc',
       'common/api/atom_api_id_weak_map.h',
       'common/api/atom_api_shell.cc',
diff --git a/browser/api/atom_api_app.h b/browser/api/atom_api_app.h
index 7bfa6d091aac..7ca6d0817af2 100644
--- a/browser/api/atom_api_app.h
+++ b/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 {
 
diff --git a/browser/api/atom_api_auto_updater.h b/browser/api/atom_api_auto_updater.h
index b75d55212c21..03d649e2ba66 100644
--- a/browser/api/atom_api_auto_updater.h
+++ b/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 {
 
diff --git a/browser/api/atom_api_menu.h b/browser/api/atom_api_menu.h
index 9dac74cc10f1..d642892f576a 100644
--- a/browser/api/atom_api_menu.h
+++ b/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 {
diff --git a/browser/api/atom_api_power_monitor.h b/browser/api/atom_api_power_monitor.h
index 88c68168b853..3febb438a61d 100644
--- a/browser/api/atom_api_power_monitor.h
+++ b/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 {
 
diff --git a/browser/api/atom_api_window.h b/browser/api/atom_api_window.h
index cc069bd70ddd..1526e4802a09 100644
--- a/browser/api/atom_api_window.h
+++ b/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 {
diff --git a/browser/api/atom_api_event_emitter.cc b/common/api/atom_api_event_emitter.cc
similarity index 97%
rename from browser/api/atom_api_event_emitter.cc
rename to common/api/atom_api_event_emitter.cc
index 15dc5ddedaf9..f175810ad45f 100644
--- a/browser/api/atom_api_event_emitter.cc
+++ b/common/api/atom_api_event_emitter.cc
@@ -2,7 +2,7 @@
 // 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 "common/api/atom_api_event_emitter.h"
 
 #include <vector>
 
diff --git a/browser/api/atom_api_event_emitter.h b/common/api/atom_api_event_emitter.h
similarity index 85%
rename from browser/api/atom_api_event_emitter.h
rename to common/api/atom_api_event_emitter.h
index dd2292238601..81689d23bf0a 100644
--- a/browser/api/atom_api_event_emitter.h
+++ b/common/api/atom_api_event_emitter.h
@@ -2,8 +2,8 @@
 // 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_
+#ifndef ATOM_COMMON_API_ATOM_API_EVENT_EMITTER_H_
+#define ATOM_COMMON_API_ATOM_API_EVENT_EMITTER_H_
 
 #include <string>
 
@@ -40,4 +40,4 @@ class EventEmitter : public node::ObjectWrap {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_API_EVENT_EMITTER_H_
+#endif  // ATOM_COMMON_API_ATOM_API_EVENT_EMITTER_H_