From dc4ffc998b3a4f95e8e607f7cd372f6202684640 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Tue, 28 Jun 2011 14:24:05 +0000 Subject: Remove ifdef's for touchui stuff from events code. Also, make sure the touch_pressed_handler_ is the view being removed before resetting it to NULL. BUG=none TEST=things compile and existing tests continue to pass Review URL: http://codereview.chromium.org/7276002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90762 0039d316-1c4b-4281-b951-d872f2087c98 --- views/view.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'views/view.cc') diff --git a/views/view.cc b/views/view.cc index eca7c75..db5f589 100644 --- a/views/view.cc +++ b/views/view.cc @@ -864,12 +864,10 @@ void View::OnMouseEntered(const MouseEvent& event) { void View::OnMouseExited(const MouseEvent& event) { } -#if defined(TOUCH_UI) ui::TouchStatus View::OnTouchEvent(const TouchEvent& event) { DVLOG(1) << "visited the OnTouchEvent"; return ui::TOUCH_STATUS_UNKNOWN; } -#endif void View::SetMouseHandler(View *new_mouse_handler) { // It is valid for new_mouse_handler to be NULL @@ -1834,13 +1832,11 @@ void View::ProcessMouseReleased(const MouseEvent& event) { // WARNING: we may have been deleted. } -#if defined(TOUCH_UI) ui::TouchStatus View::ProcessTouchEvent(const TouchEvent& event) { // TODO(rjkroege): Implement a grab scheme similar to as // as is found in MousePressed. return OnTouchEvent(event); } -#endif // Accelerators ---------------------------------------------------------------- -- cgit v1.1