events: Move EventTarget into Event.

ui/aura/window_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/window.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 147 matching lines @@
   }
 
   int capture_changed_event_count() const {
     return capture_changed_event_count_;
   }
   int capture_lost_count() const { return capture_lost_count_; }
   int mouse_event_count() const { return mouse_event_count_; }
   int touch_event_count() const { return touch_event_count_; }
   int gesture_event_count() const { return gesture_event_count_; }
 
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED)
       capture_changed_event_count_++;
     mouse_event_count_++;
-    return false;
+    return ui::ER_UNHANDLED;
   }
   virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     touch_event_count_++;
     return ui::TOUCH_STATUS_UNKNOWN;
   }
   virtual ui::EventResult OnGestureEvent(
       ui::GestureEvent* event) OVERRIDE {
     gesture_event_count_++;
     return ui::ER_UNHANDLED;
   }
@@ skipping 843 matching lines @@
   // The |child| window is moved to the 0,0 in screen coordinates.
   // |GetBoundsInRootWindow()| should return 0,0.
   child->SetBounds(gfx::Rect(100, 100, 100, 100));
   EXPECT_EQ("0,0 100x100", child->GetBoundsInRootWindow().ToString());
 }
 
 class MouseEnterExitWindowDelegate : public TestWindowDelegate {
  public:
   MouseEnterExitWindowDelegate() : entered_(false), exited_(false) {}
 
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     switch (event->type()) {
       case ui::ET_MOUSE_ENTERED:
         entered_ = true;
         break;
       case ui::ET_MOUSE_EXITED:
         exited_ = true;
         break;
       default:
         break;
     }
-    return false;
+    return ui::ER_UNHANDLED;
   }
 
   bool entered() const { return entered_; }
   bool exited() const { return exited_; }
 
   // Clear the entered / exited states.
   void ResetExpectations() {
     entered_ = false;
     exited_ = false;
   }
@@ skipping 1479 matching lines @@
   // Move |w2| to be a child of |w1|.
   w1->AddChild(w2.get());
   // Sine we moved in the same root, observer shouldn't be notified.
   EXPECT_EQ("0 0", observer.CountStringAndReset());
   // |w2| should still have focus after moving.
   EXPECT_TRUE(w2->HasFocus());
 }
 
 }  // namespace test
 }  // namespace aura