fix: Update MacOS constants

Author: martin-world1977

shell/browser/ui/cocoa/electron_native_view.mm

@@ -323,10 +323,10 @@ void UpdateTrackingAreas(NSView* self, SEL _cmd) {
   NativeViewPrivate* priv = [self nativeViewPrivate];
   if (NSPointInRect(mouse, [self bounds])) {  // mouse in view.
     if (!priv->hovered)
-      [self mouseEntered:FakeEvent(self, NSMouseEntered)];
+      [self mouseEntered:FakeEvent(self, NSEventTypeMouseEntered)];
   } else {  // mouse not in view.
     if (priv->hovered)
-      [self mouseExited:FakeEvent(self, NSMouseExited)];
+      [self mouseExited:FakeEvent(self, NSEventTypeMouseExited)];
   }
 
   [self enableTracking];

shell/browser/ui/cocoa/mouse_capture.mm

@@ -6,12 +6,14 @@
 namespace electron {
 
 MouseCapture::MouseCapture(NativeView* view) : view_(view) {
-  NSEventMask event_mask =
-      NSLeftMouseDownMask | NSLeftMouseUpMask | NSRightMouseDownMask |
-      NSRightMouseUpMask | NSMouseMovedMask | NSLeftMouseDraggedMask |
-      NSRightMouseDraggedMask | NSMouseEnteredMask | NSMouseExitedMask |
-      NSScrollWheelMask | NSOtherMouseDownMask | NSOtherMouseUpMask |
-      NSOtherMouseDraggedMask;
+  NSEventMask event_mask = NSEventMaskLeftMouseDown | NSEventMaskLeftMouseUp |
+                           NSEventMaskRightMouseDown | NSEventMaskRightMouseUp |
+                           NSEventMaskMouseMoved | NSEventMaskLeftMouseDragged |
+                           NSEventMaskRightMouseDragged |
+                           NSEventMaskMouseEntered | NSEventMaskMouseExited |
+                           NSEventMaskScrollWheel | NSEventMaskOtherMouseDown |
+                           NSEventMaskOtherMouseUp |
+                           NSEventMaskOtherMouseDragged;
   local_monitor_ = [NSEvent
       addLocalMonitorForEventsMatchingMask:event_mask
                                    handler:^NSEvent*(NSEvent* event) {

shell/browser/ui/native_view_mac.mm

@@ -17,26 +17,26 @@
 
 EventType EventTypeFromNS(NSEvent* event) {
   switch ([event type]) {
-    case NSLeftMouseDown:
+    case NSEventTypeLeftMouseDown:
       return EventType::kLeftMouseDown;
-    case NSRightMouseDown:
+    case NSEventTypeRightMouseDown:
       return EventType::kRightMouseDown;
-    case NSOtherMouseDown:
+    case NSEventTypeOtherMouseDown:
       return EventType::kOtherMouseDown;
-    case NSLeftMouseUp:
+    case NSEventTypeLeftMouseUp:
       return EventType::kLeftMouseUp;
-    case NSRightMouseUp:
+    case NSEventTypeRightMouseUp:
       return EventType::kRightMouseUp;
-    case NSOtherMouseUp:
+    case NSEventTypeOtherMouseUp:
       return EventType::kOtherMouseUp;
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
-    case NSMouseMoved:
+    case NSEventTypeLeftMouseDragged:
+    case NSEventTypeRightMouseDragged:
+    case NSEventTypeOtherMouseDragged:
+    case NSEventTypeMouseMoved:
       return EventType::kMouseMove;
-    case NSMouseEntered:
+    case NSEventTypeMouseEntered:
       return EventType::kMouseEnter;
-    case NSMouseExited:
+    case NSEventTypeMouseExited:
       return EventType::kMouseLeave;
     default:
       return EventType::kUnknown;