Merge pull request #4181 from bengotow/scroll-touch-events

Extend NativeWindow to track touch-based scroll events on OS X

diff --cc atom/browser/api/atom_api_window.cc
Simple merge

diff --cc atom/browser/api/atom_api_window.h
Simple merge

diff --cc atom/browser/native_window.cc
Simple merge

diff --cc atom/browser/native_window.h
Simple merge

diff --cc atom/browser/native_window_mac.h
index 9641265,927e971..4d86ec3
--- 1/atom/browser/native_window_mac.h
--- 2/atom/browser/native_window_mac.h
+++ b/atom/browser/native_window_mac.h
@@@ -120,12 -108,9 +120,13 @@@ class NativeWindowMac : public NativeWi
    // whehter we can drag.
    void UpdateDraggableRegionViews(const std::vector<DraggableRegion>& regions);
  
 +  // Set the attribute of NSWindow while work around a bug of zo0m button.
 +  void SetStyleMask(bool on, NSUInteger flag);
 +  void SetCollectionBehavior(bool on, NSUInteger flag);
 +
    base::scoped_nsobject<AtomNSWindow> window_;
    base::scoped_nsobject<AtomNSWindowDelegate> window_delegate_;
+   base::scoped_nsobject<id> event_monitor_;
  
    // The view that will fill the whole frameless window.
    base::scoped_nsobject<FullSizeContentView> content_view_;

diff --cc atom/browser/native_window_mac.mm
Simple merge