Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 36 case NSRightMouseUp: | 36 case NSRightMouseUp: |
| 37 case NSOtherMouseUp: | 37 case NSOtherMouseUp: |
| 38 return ET_MOUSE_RELEASED; | 38 return ET_MOUSE_RELEASED; |
| 39 case NSLeftMouseDragged: | 39 case NSLeftMouseDragged: |
| 40 case NSRightMouseDragged: | 40 case NSRightMouseDragged: |
| 41 case NSOtherMouseDragged: | 41 case NSOtherMouseDragged: |
| 42 return ET_MOUSE_DRAGGED; | 42 return ET_MOUSE_DRAGGED; |
| 43 case NSMouseMoved: | 43 case NSMouseMoved: |
| 44 return ET_MOUSE_MOVED; | 44 return ET_MOUSE_MOVED; |
| 45 case NSScrollWheel: | 45 case NSScrollWheel: |
| 46 return ET_SCROLL; | 46 return ET_MOUSEWHEEL; |
|
Avi (use Gerrit)
2016/10/25 15:34:50
This was recently changed by Trent in r421082; why
snake
2016/10/25 15:46:18
views::Widget is not supported ET_SCROLL, only ET_
snake
2016/10/25 20:52:05
Reverted.
| |
| 47 case NSMouseEntered: | 47 case NSMouseEntered: |
| 48 return ET_MOUSE_ENTERED; | 48 return ET_MOUSE_ENTERED; |
| 49 case NSMouseExited: | 49 case NSMouseExited: |
| 50 return ET_MOUSE_EXITED; | 50 return ET_MOUSE_EXITED; |
| 51 case NSEventTypeSwipe: | 51 case NSEventTypeSwipe: |
| 52 return ET_SCROLL_FLING_START; | 52 return ET_SCROLL_FLING_START; |
| 53 case NSAppKitDefined: | 53 case NSAppKitDefined: |
| 54 case NSSystemDefined: | 54 case NSSystemDefined: |
| 55 return ET_UNKNOWN; | 55 return ET_UNKNOWN; |
| 56 case NSFlagsChanged: | 56 case NSFlagsChanged: |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 300 uint16_t return_value; | 300 uint16_t return_value; |
| 301 [text getCharacters:&return_value]; | 301 [text getCharacters:&return_value]; |
| 302 return return_value; | 302 return return_value; |
| 303 } | 303 } |
| 304 | 304 |
| 305 bool IsCharFromNative(const base::NativeEvent& native_event) { | 305 bool IsCharFromNative(const base::NativeEvent& native_event) { |
| 306 return false; | 306 return false; |
| 307 } | 307 } |
| 308 | 308 |
| 309 } // namespace ui | 309 } // namespace ui |
| OLD | NEW |