events: Move EventTarget into Event.

ui/aura/test/test_window_delegate.h

 // 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.
 
 #ifndef UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 #define UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 17 matching lines @@
   void set_window_component(int window_component) {
     window_component_ = window_component;
   }
 
   // Overridden from WindowDelegate:
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnFocus(Window* old_focused_window) OVERRIDE;
   virtual void OnBlur() OVERRIDE;
-  virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
   virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual bool ShouldDescendIntoChildForEventHandling(
       Window* child,
       const gfx::Point& location) OVERRIDE;
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual ui::EventResult OnGestureEvent(
-      ui::GestureEvent* event) OVERRIDE;
   virtual bool CanFocus() OVERRIDE;
   virtual void OnCaptureLost() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
+  // Overridden from ui::EventHandler:
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
+  virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+
  private:
   int window_component_;
   bool delete_on_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
 // A simple WindowDelegate implementation for these tests. It owns itself
 // (deletes itself when the Window it is attached to is destroyed).
 class ColorTestWindowDelegate : public TestWindowDelegate {
  public:
   explicit ColorTestWindowDelegate(SkColor color);
   virtual ~ColorTestWindowDelegate();
 
   ui::KeyboardCode last_key_code() const { return last_key_code_; }
 
   // Overridden from TestWindowDelegate:
-  virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   SkColor color_;
   ui::KeyboardCode last_key_code_;
 
   DISALLOW_COPY_AND_ASSIGN(ColorTestWindowDelegate);
 };
 
@@ skipping 11 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MaskedWindowDelegate);
 };
 
 // Keeps track of mouse/key events.
 class EventCountDelegate : public TestWindowDelegate {
  public:
   EventCountDelegate();
 
   // Overridden from TestWindowDelegate:
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
 
   // Returns the counts of mouse motion events in the
   // form of "<enter> <move> <leave>".
   std::string GetMouseMotionCountsAndReset();
 
   // Returns the counts of mouse button events in the
   // form of "<press> <release>".
   std::string GetMouseButtonCountsAndReset();
 
   // Returns the counts of key events in the form of
   // "<press> <release>".
   std::string GetKeyCountsAndReset();
 
  private:
   int mouse_enter_count_;
   int mouse_move_count_;
   int mouse_leave_count_;
   int mouse_press_count_;
   int mouse_release_count_;
   int key_press_count_;
   int key_release_count_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCountDelegate);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_