Switch to a single OS X swipe event with a direction argument

atom/browser/api/atom_api_window.cc

@@ -243,20 +243,8 @@ void Window::OnWindowScrollTouchEnd() {
   Emit("scroll-touch-end");
 }
 
-void Window::OnWindowSwipeUp() {
+void Window::OnWindowSwipe(const std::string& direction) {
-  Emit("swipe-up");
+  Emit("swipe", direction);
-}
-
-void Window::OnWindowSwipeRight() {
-  Emit("swipe-right");
-}
-
-void Window::OnWindowSwipeDown() {
-  Emit("swipe-down");
-}
-
-void Window::OnWindowSwipeLeft() {
-  Emit("swipe-left");
 }
 
 void Window::OnWindowEnterHtmlFullScreen() {

atom/browser/api/atom_api_window.h

@@ -69,10 +69,7 @@ class Window : public mate::TrackableObject<Window>,
   void OnWindowMoved() override;
   void OnWindowScrollTouchBegin() override;
   void OnWindowScrollTouchEnd() override;
-  void OnWindowSwipeUp() override;
+  void OnWindowSwipe(const std::string& direction) override;
-  void OnWindowSwipeRight() override;
-  void OnWindowSwipeDown() override;
-  void OnWindowSwipeLeft() override;
   void OnWindowEnterFullScreen() override;
   void OnWindowLeaveFullScreen() override;
   void OnWindowEnterHtmlFullScreen() override;

atom/browser/native_window.cc

@@ -480,24 +480,9 @@ void NativeWindow::NotifyWindowScrollTouchEnd() {
                     OnWindowScrollTouchEnd());
 }
 
-void NativeWindow::NotifyWindowSwipeUp() {
+void NativeWindow::NotifyWindowSwipe(const std::string& direction) {
   FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-                    OnWindowSwipeUp());
+                    OnWindowSwipe(direction));
-}
-
-void NativeWindow::NotifyWindowSwipeRight() {
-  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-                    OnWindowSwipeRight());
-}
-
-void NativeWindow::NotifyWindowSwipeDown() {
-  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-                    OnWindowSwipeDown());
-}
-
-void NativeWindow::NotifyWindowSwipeLeft() {
-  FOR_EACH_OBSERVER(NativeWindowObserver, observers_,
-                    OnWindowSwipeLeft());
 }
 
 void NativeWindow::NotifyWindowLeaveFullScreen() {

atom/browser/native_window.h

@@ -221,10 +221,7 @@ class NativeWindow : public base::SupportsUserData,
   void NotifyWindowMoved();
   void NotifyWindowScrollTouchBegin();
   void NotifyWindowScrollTouchEnd();
-  void NotifyWindowSwipeUp();
+  void NotifyWindowSwipe(const std::string& direction);
-  void NotifyWindowSwipeRight();
-  void NotifyWindowSwipeDown();
-  void NotifyWindowSwipeLeft();
   void NotifyWindowEnterFullScreen();
   void NotifyWindowLeaveFullScreen();
   void NotifyWindowEnterHtmlFullScreen();

atom/browser/native_window_mac.mm

@@ -269,13 +269,13 @@ bool ScopedDisableResize::disable_resize_ = false;
 
 - (void)swipeWithEvent:(NSEvent *)event {
   if (event.deltaY == 1.0) {
-        shell_->NotifyWindowSwipeUp();
+    shell_->NotifyWindowSwipe("up");
   } else if (event.deltaX == -1.0) {
-        shell_->NotifyWindowSwipeRight();
+    shell_->NotifyWindowSwipe("right");
   } else if (event.deltaY == -1.0) {
-        shell_->NotifyWindowSwipeDown();
+    shell_->NotifyWindowSwipe("down");
   } else if (event.deltaX == 1.0) {
-        shell_->NotifyWindowSwipeLeft();
+    shell_->NotifyWindowSwipe("left");
   }
 }
 

atom/browser/native_window_observer.h

@@ -58,10 +58,7 @@ class NativeWindowObserver {
   virtual void OnWindowMoved() {}
   virtual void OnWindowScrollTouchBegin() {}
   virtual void OnWindowScrollTouchEnd() {}
-  virtual void OnWindowSwipeUp() {}
+  virtual void OnWindowSwipe(const std::string& direction) {}
-  virtual void OnWindowSwipeRight() {}
-  virtual void OnWindowSwipeDown() {}
-  virtual void OnWindowSwipeLeft() {}
   virtual void OnWindowEnterFullScreen() {}
   virtual void OnWindowLeaveFullScreen() {}
   virtual void OnWindowEnterHtmlFullScreen() {}

docs/api/browser-window.md

@@ -322,21 +322,14 @@ Emitted when scroll wheel event phase has begun.
 
 Emitted when scroll wheel event phase has ended.
 
-### Event: 'swipe-up' _OS X_
+### Event: 'swipe' _OS X_
 
-Emitted on 3-finger swipe up.
+Returns:
 
-### Event: 'swipe-right' _OS X_
+* `event` Event
+* `direction` String
 
-Emitted on 3-finger swipe right.
+Emitted on 3-finger swipe. Possible directions are `up`, `right`, `down`, `left`.
-
-### Event: 'swipe-down' _OS X_
-
-Emitted on 3-finger swipe down.
-
-### Event: 'swipe-left' _OS X_
-
-Emitted on 3-finger swipe left.
 
 ## Methods