Merge pull request #3724 from atom/node5

Upgrade to Node v5.1.1

atom.gyp

@@ -4,7 +4,7 @@
     'product_name%': 'Electron',
     'company_name%': 'GitHub, Inc',
     'company_abbr%': 'github',
-    'version%': '0.35.4',
+    'version%': '0.36.0',
   },
   'includes': [
     'filenames.gypi',

atom/browser/native_window_mac.mm

@@ -18,7 +18,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "native_mate/dictionary.h"
-#import "ui/base/cocoa/command_dispatcher.h"
 #include "ui/gfx/skia_util.h"
 
 namespace {
@@ -209,11 +208,10 @@ bool ScopedDisableResize::disable_resize_ = false;
 
 @end
 
-@interface AtomNSWindow : NSWindow<CommandDispatchingWindow> {
+@interface AtomNSWindow : NSWindow {
  @private
   atom::NativeWindowMac* shell_;
   bool enable_larger_than_screen_;
-  base::scoped_nsobject<CommandDispatcher> commandDispatcher_;
 }
 @property BOOL acceptsFirstMouse;
 @property BOOL disableAutoHideCursor;
@@ -227,7 +225,6 @@ bool ScopedDisableResize::disable_resize_ = false;
 
 - (void)setShell:(atom::NativeWindowMac*)shell {
   shell_ = shell;
-  commandDispatcher_.reset([[CommandDispatcher alloc] initWithOwner:self]);
 }
 
 - (void)setEnableLargerThanScreen:(bool)enable {
@@ -276,25 +273,6 @@ bool ScopedDisableResize::disable_resize_ = false;
   return !self.disableKeyOrMainWindow;
 }
 
-// CommandDispatchingWindow implementation.
-
-- (void)setCommandHandler:(id<UserInterfaceItemCommandHandler>)commandHandler {
-}
-
-- (BOOL)redispatchKeyEvent:(NSEvent*)event {
-  return [commandDispatcher_ redispatchKeyEvent:event];
-}
-
-- (BOOL)defaultPerformKeyEquivalent:(NSEvent*)event {
-  return [super performKeyEquivalent:event];
-}
-
-- (void)commandDispatch:(id)sender {
-}
-
-- (void)commandDispatchUsingKeyModifiers:(id)sender {
-}
-
 @end
 
 @interface ControlRegionView : NSView

atom/common/chrome_version.h

@@ -8,7 +8,7 @@
 #ifndef ATOM_COMMON_CHROME_VERSION_H_
 #define ATOM_COMMON_CHROME_VERSION_H_
 
-#define CHROME_VERSION_STRING "45.0.2454.85"
+#define CHROME_VERSION_STRING "47.0.2526.73"
 #define CHROME_VERSION "v" CHROME_VERSION_STRING
 
 #endif  // ATOM_COMMON_CHROME_VERSION_H_

script/bootstrap.py

@@ -196,7 +196,7 @@ def create_chrome_version_h():
 def touch_config_gypi():
   config_gypi = os.path.join(SOURCE_ROOT, 'vendor', 'node', 'config.gypi')
   with open(config_gypi, 'w+') as f:
-    content = '\n{}'
+    content = "\n{'variables':{}}"
     if f.read() != content:
       f.write(content)
 

vendor/brightray

@@ -1 +1 @@
-Subproject commit 878e63860b59d3443cd9f739d7533f2be1109773
+Subproject commit 9b4d052d2af716c340034ed7815d9d758cd7804d

vendor/node

@@ -1 +1 @@
-Subproject commit 97d9298d8a431f27e2aded918ae9f2a673c9cf6f
+Subproject commit 38d791843463b19c623c97c1c550a4e3c5a406d4