Make ToplevelWindowEventFilter and WorkspaceEventFilter into event handlers.

ash/wm/workspace/workspace_event_handler.h

Index: ash/wm/workspace/workspace_event_handler.h
===================================================================
--- ash/wm/workspace/workspace_event_handler.h	(revision 155914)
+++ ash/wm/workspace/workspace_event_handler.h	(working copy)
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
+#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
+#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
 
-#include "ash/wm/toplevel_window_event_filter.h"
+#include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/workspace/multi_window_resize_controller.h"
 
 namespace aura {
@@ -15,29 +15,26 @@
 namespace ash {
 namespace internal {
 
-class WorkspaceEventFilterTestHelper;
+class WorkspaceEventHandlerTestHelper;
 
-class WorkspaceEventFilter : public ToplevelWindowEventFilter {
+class WorkspaceEventHandler : public ToplevelWindowEventHandler {
  public:
-  explicit WorkspaceEventFilter(aura::Window* owner);
-  virtual ~WorkspaceEventFilter();
+  explicit WorkspaceEventHandler(aura::Window* owner);
+  virtual ~WorkspaceEventHandler();
 
-  // Overridden from ToplevelWindowEventFilter:
-  virtual bool PreHandleMouseEvent(aura::Window* target,
-                                   ui::MouseEvent* event) OVERRIDE;
-  virtual ui::EventResult PreHandleGestureEvent(
-      aura::Window* target,
-      ui::GestureEvent* event) OVERRIDE;
+  // Overridden from ToplevelWindowEventHandler:
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
  protected:
-  // Overridden from ToplevelWindowEventFilter:
+  // Overridden from ToplevelWindowEventHandler:
   virtual WindowResizer* CreateWindowResizer(
       aura::Window* window,
       const gfx::Point& point_in_parent,
       int window_component) OVERRIDE;
 
  private:
-  friend class WorkspaceEventFilterTestHelper;
+  friend class WorkspaceEventHandlerTestHelper;
 
   // Determines if |event| corresponds to a double click on either the top or
   // bottom vertical resize edge, and if so toggles the vertical height of the
@@ -51,10 +48,10 @@
   // If non-NULL, set to true in the destructor.
   bool* destroyed_;
 
-  DISALLOW_COPY_AND_ASSIGN(WorkspaceEventFilter);
+  DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandler);
 };
 
 }  // namespace internal
 }  // namespace ash
 
-#endif  // ASH_WM_WORKSPACE_WORKSPACE_EVENT_FILTER_H_
+#endif  // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_