Index: ui/events/event_utils.cc |
diff --git a/ui/events/event_utils.cc b/ui/events/event_utils.cc |
index 084a84ddfbf9cbd170568aeb2d0bef742eb3c6e5..db6215f4654a56ae3da013c96f672002fff8b812 100644 |
--- a/ui/events/event_utils.cc |
+++ b/ui/events/event_utils.cc |
@@ -11,57 +11,6 @@ |
namespace ui { |
-namespace { |
-int g_custom_event_types = ET_LAST; |
-} // namespace |
- |
-scoped_ptr<Event> EventFromNative(const base::NativeEvent& native_event) { |
- scoped_ptr<Event> event; |
- EventType type = EventTypeFromNative(native_event); |
- switch(type) { |
- case ET_KEY_PRESSED: |
- case ET_KEY_RELEASED: |
- event.reset(new KeyEvent(native_event)); |
- break; |
- |
- case ET_TRANSLATED_KEY_PRESS: |
- case ET_TRANSLATED_KEY_RELEASE: |
- // These should not be generated by native events. |
- NOTREACHED(); |
- break; |
- |
- case ET_MOUSE_PRESSED: |
- case ET_MOUSE_DRAGGED: |
- case ET_MOUSE_RELEASED: |
- case ET_MOUSE_MOVED: |
- case ET_MOUSE_ENTERED: |
- case ET_MOUSE_EXITED: |
- event.reset(new MouseEvent(native_event)); |
- break; |
- |
- case ET_MOUSEWHEEL: |
- event.reset(new MouseWheelEvent(native_event)); |
- break; |
- |
- case ET_SCROLL_FLING_START: |
- case ET_SCROLL_FLING_CANCEL: |
- case ET_SCROLL: |
- event.reset(new ScrollEvent(native_event)); |
- break; |
- |
- case ET_TOUCH_RELEASED: |
- case ET_TOUCH_PRESSED: |
- case ET_TOUCH_MOVED: |
- case ET_TOUCH_CANCELLED: |
- event.reset(new TouchEvent(native_event)); |
- break; |
- |
- default: |
- break; |
- } |
- return event.Pass(); |
-} |
- |
// From third_party/WebKit/Source/web/gtk/WebInputEventFactory.cpp: |
base::char16 GetControlCharacterForKeycode(int windows_key_code, bool shift) { |
if (windows_key_code >= ui::VKEY_A && |
@@ -107,10 +56,6 @@ base::char16 GetControlCharacterForKeycode(int windows_key_code, bool shift) { |
return 0; |
} |
-int RegisterCustomEventType() { |
- return ++g_custom_event_types; |
-} |
- |
base::TimeDelta EventTimeForNow() { |
return base::TimeDelta::FromInternalValue( |
base::TimeTicks::Now().ToInternalValue()); |