events: Move EventTarget into Event.

ui/aura/gestures/gesture_recognizer_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 "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 286 matching lines @@
     double_click_ = false;
   }
 
   bool mouse_enter() const { return mouse_enter_; }
   bool mouse_exit() const { return mouse_exit_; }
   bool mouse_press() const { return mouse_press_; }
   bool mouse_move() const { return mouse_move_; }
   bool mouse_release() const { return mouse_release_; }
   bool double_click() const { return double_click_; }
 
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     switch (event->type()) {
       case ui::ET_MOUSE_PRESSED:
         double_click_ = event->flags() & ui::EF_IS_DOUBLE_CLICK;
         mouse_press_ = true;
         break;
       case ui::ET_MOUSE_RELEASED:
         mouse_release_ = true;
         break;
       case ui::ET_MOUSE_MOVED:
         mouse_move_ = true;
         break;
       case ui::ET_MOUSE_ENTERED:
         mouse_enter_ = true;
         break;
       case ui::ET_MOUSE_EXITED:
         mouse_exit_ = true;
         break;
       default:
         NOTREACHED();
     }
-    return true;
+    return ui::ER_HANDLED;
   }
 
  private:
   bool mouse_enter_;
   bool mouse_exit_;
   bool mouse_press_;
   bool mouse_release_;
   bool mouse_move_;
   bool double_click_;
 
@@ skipping 2492 matching lines @@
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->pinch_update());
 
   delegate->Reset();
 }
 
 }  // namespace test
 }  // namespace aura