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

Unified Diff: ui/views/widget/native_widget_aura.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/widget/drop_helper.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_aura.cc
===================================================================
--- ui/views/widget/native_widget_aura.cc (revision 151481)
+++ ui/views/widget/native_widget_aura.cc (working copy)
@@ -792,16 +792,15 @@
bool NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
DCHECK(window_->IsVisible());
if (event->type() == ui::ET_MOUSEWHEEL) {
- MouseWheelEvent wheel_event(event);
+ ui::MouseWheelEvent wheel_event(event);
return delegate_->OnMouseEvent(wheel_event);
}
if (event->type() == ui::ET_SCROLL) {
- ScrollEvent scroll_event(static_cast<ui::ScrollEvent*>(event));
- if (delegate_->OnMouseEvent(scroll_event))
+ if (delegate_->OnMouseEvent(*event))
return true;
// Convert unprocessed scroll events into wheel events.
- MouseWheelEvent wheel_event(scroll_event);
+ ui::MouseWheelEvent wheel_event(*static_cast<ui::ScrollEvent*>(event));
return delegate_->OnMouseEvent(wheel_event);
}
if (tooltip_manager_.get())
@@ -811,15 +810,13 @@
ui::TouchStatus NativeWidgetAura::OnTouchEvent(ui::TouchEvent* event) {
DCHECK(window_->IsVisible());
- TouchEvent touch_event(event);
- return delegate_->OnTouchEvent(touch_event);
+ return delegate_->OnTouchEvent(*event);
}
ui::GestureStatus NativeWidgetAura::OnGestureEvent(
ui::GestureEvent* event) {
DCHECK(window_->IsVisible());
- GestureEvent gesture_event(event);
- return delegate_->OnGestureEvent(gesture_event);
+ return delegate_->OnGestureEvent(*event);
}
bool NativeWidgetAura::CanFocus() {
« no previous file with comments | « ui/views/widget/drop_helper.cc ('k') | ui/views/widget/native_widget_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698