Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: ui/events/cocoa/events_mac.mm

Issue 981693002: MacViews: Fix crash when EventMonitorMac receives a NSSystemDefinedEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@views
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/events/event_utils.h" 5 #include "ui/events/event_utils.h"
6 6
7 #include <Cocoa/Cocoa.h> 7 #include <Cocoa/Cocoa.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #import "base/mac/mac_util.h" 10 #import "base/mac/mac_util.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 case NSMouseMoved: 45 case NSMouseMoved:
46 return ET_MOUSE_MOVED; 46 return ET_MOUSE_MOVED;
47 case NSScrollWheel: 47 case NSScrollWheel:
48 return ET_MOUSEWHEEL; 48 return ET_MOUSEWHEEL;
49 case NSMouseEntered: 49 case NSMouseEntered:
50 return ET_MOUSE_ENTERED; 50 return ET_MOUSE_ENTERED;
51 case NSMouseExited: 51 case NSMouseExited:
52 return ET_MOUSE_EXITED; 52 return ET_MOUSE_EXITED;
53 case NSEventTypeSwipe: 53 case NSEventTypeSwipe:
54 return ET_SCROLL_FLING_START; 54 return ET_SCROLL_FLING_START;
55 case NSFlagsChanged:
56 case NSAppKitDefined: 55 case NSAppKitDefined:
57 case NSSystemDefined: 56 case NSSystemDefined:
57 return ET_UNKNOWN;
58 case NSFlagsChanged:
58 case NSApplicationDefined: 59 case NSApplicationDefined:
59 case NSPeriodic: 60 case NSPeriodic:
60 case NSCursorUpdate: 61 case NSCursorUpdate:
61 case NSTabletPoint: 62 case NSTabletPoint:
62 case NSTabletProximity: 63 case NSTabletProximity:
63 case NSEventTypeGesture: 64 case NSEventTypeGesture:
64 case NSEventTypeMagnify: 65 case NSEventTypeMagnify:
65 case NSEventTypeRotate: 66 case NSEventTypeRotate:
66 case NSEventTypeBeginGesture: 67 case NSEventTypeBeginGesture:
67 case NSEventTypeEndGesture: 68 case NSEventTypeEndGesture:
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 uint16 return_value; 262 uint16 return_value;
262 [text getCharacters:&return_value]; 263 [text getCharacters:&return_value];
263 return return_value; 264 return return_value;
264 } 265 }
265 266
266 bool IsCharFromNative(const base::NativeEvent& native_event) { 267 bool IsCharFromNative(const base::NativeEvent& native_event) {
267 return false; 268 return false;
268 } 269 }
269 270
270 } // namespace ui 271 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | ui/views/event_monitor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698