events: Clean up dispatching code for touch-events.

ash/wm/window_modality_controller_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 "ash/wm/window_modality_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/capture_tracking_view.h"
 #include "ash/wm/window_util.h"
@@ skipping 276 matching lines @@
   virtual ~TouchTrackerWindowDelegate() {}
 
   void reset() {
     received_touch_ = false;
   }
 
   bool received_touch() const { return received_touch_; }
 
  private:
   // Overridden from aura::test::TestWindowDelegate.
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     received_touch_ = true;
     return aura::test::TestWindowDelegate::OnTouchEvent(event);
   }
 
   bool received_touch_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchTrackerWindowDelegate);
 };
 
 // Modality should prevent events from being passed to the transient parent.
@@ skipping 29 matching lines @@
                                          gfx::Point(10, 10));
     generator.PressMoveAndReleaseTouchTo(gfx::Point(10, 10));
     EXPECT_TRUE(wm::IsActiveWindow(w11.get()));
     EXPECT_FALSE(d1.received_touch());
     EXPECT_FALSE(d11.received_touch());
   }
 }
 
 }  // namespace internal
 }  // namespace ash