events: Clean up dispatching code for touch-events.

ui/aura/event_filter_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/event_filter.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 49 matching lines @@
   virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     ++key_event_count_;
     return key_event_handling_result_;
   }
 
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     ++mouse_event_count_;
     return mouse_event_handling_result_;
   }
 
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     ++touch_event_count_;
     // TODO(sadrul): !
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   }
 
   virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     // TODO(sadrul): !
     return ui::ER_UNHANDLED;
   }
  private:
   int key_event_count_;
   int mouse_event_count_;
   int touch_event_count_;
@@ skipping 211 matching lines @@
   generator.PressKey(ui::VKEY_A, 0);
   generator.PressLeftButton();
 
   EXPECT_EQ(1, w1_filter->key_event_count());
   EXPECT_EQ(0, d11.key_event_count());
   EXPECT_EQ(1, w1_filter->mouse_event_count());
   EXPECT_EQ(0, d11.mouse_event_count());
 }
 
 }  // namespace aura