events: Move EventTarget into Event.

ui/aura/root_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/root_window.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/event_client.h"
@@ skipping 38 matching lines @@
   int mouse_event_count() const { return mouse_event_count_; }
   gfx::Point mouse_event_location() const { return mouse_event_location_; }
   int mouse_event_flags() const { return mouse_event_flags_; }
 
   virtual int GetNonClientComponent(const gfx::Point& location) const OVERRIDE {
     NonClientDelegate* self = const_cast<NonClientDelegate*>(this);
     self->non_client_count_++;
     self->non_client_location_ = location;
     return HTTOPLEFT;
   }
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     mouse_event_count_++;
     mouse_event_location_ = event->location();
     mouse_event_flags_ = event->flags();
-    return true;
+    return ui::ER_HANDLED;
   }
 
  private:
   int non_client_count_;
   gfx::Point non_client_location_;
   int mouse_event_count_;
   gfx::Point mouse_event_location_;
   int mouse_event_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientDelegate);
@@ skipping 600 matching lines @@
 
   void Reset(Window* window, bool delete_during_handle) {
     window_ = window;
     delete_during_handle_ = delete_during_handle;
     got_event_ = false;
   }
   bool got_event() const { return got_event_; }
 
  private:
   // Overridden from WindowDelegate:
-  virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE {
     if (delete_during_handle_)
       delete window_;
     got_event_ = true;
-    return false;
+    return ui::ER_UNHANDLED;
   }
 
-  virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     if (delete_during_handle_)
       delete window_;
     got_event_ = true;
-    return false;
+    return ui::ER_UNHANDLED;
   }
 
   Window* window_;
   bool delete_during_handle_;
   bool got_event_;
 
   DISALLOW_COPY_AND_ASSIGN(DeletingWindowDelegate);
 };
 
 TEST_F(RootWindowTest, DeleteWindowDuringDispatch) {
@@ skipping 30 matching lines @@
   // handle steps from applying.
   w11 = CreateWindow(11, w1.get(), &d11);
   w1_filter->Reset(true);
   d11.Reset(w11, false);
   generator.PressLeftButton();
   EXPECT_FALSE(tracker.Contains(w11));
   EXPECT_FALSE(d11.got_event());
 }
 
 }  // namespace aura