ash: Convert some aura::EventFilters into ui::EventHandlers.

In this CL, the following EventFilters are converted into EventHandlers:
 * AcceleratorFilter
 * MagnificationControllerImpl
 * TrayEventFilter
 * TouchObserverHUD
 * AppListController
 * ShelfLayoutManager::AutoHideEventFilter
 * SystemGestureEventFilter

BUG=159632

Review URL: https://codereview.chromium.org/11362196

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167218 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 29 deletions

diff --git a/ash/accelerators/accelerator_filter.cc b/ash/accelerators/accelerator_filter.cc
index 5d179d5..69ba103 100644
--- a/ash/accelerators/accelerator_filter.cc
+++ b/ash/accelerators/accelerator_filter.cc
@@ -67,13 +67,12 @@ AcceleratorFilter::~AcceleratorFilter() {
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorFilter, EventFilter implementation:
 
-bool AcceleratorFilter::PreHandleKeyEvent(aura::Window* target,
-                                          ui::KeyEvent* event) {
+ui::EventResult AcceleratorFilter::OnKeyEvent(ui::KeyEvent* event) {
   const ui::EventType type = event->type();
   if (type != ui::ET_KEY_PRESSED && type != ui::ET_KEY_RELEASED)
-    return false;
+    return ui::ER_UNHANDLED;
   if (event->is_char())
-    return false;
+    return ui::ER_UNHANDLED;
 
   ui::Accelerator accelerator(event->key_code(),
                               event->flags() & kModifierFlagMask);
@@ -84,25 +83,26 @@ bool AcceleratorFilter::PreHandleKeyEvent(aura::Window* target,
   Shell::GetInstance()->accelerator_controller()->context()->
       UpdateContext(accelerator);
 
+  aura::Window* target = static_cast<aura::Window*>(event->target());
   if (!ShouldProcessAcceleratorsNow(accelerator, target))
-    return false;
-  return Shell::GetInstance()->accelerator_controller()->Process(accelerator);
+    return ui::ER_UNHANDLED;
+  return Shell::GetInstance()->accelerator_controller()->Process(accelerator) ?
+      ui::ER_CONSUMED : ui::ER_UNHANDLED;
 }
 
-bool AcceleratorFilter::PreHandleMouseEvent(aura::Window* target,
-                                            ui::MouseEvent* event) {
-  return false;
+ui::EventResult AcceleratorFilter::OnMouseEvent(ui::MouseEvent* event) {
+  return ui::ER_UNHANDLED;
+}
+
+ui::EventResult AcceleratorFilter::OnScrollEvent(ui::ScrollEvent* event) {
+  return ui::ER_UNHANDLED;
 }
 
-ui::EventResult AcceleratorFilter::PreHandleTouchEvent(
-    aura::Window* target,
-    ui::TouchEvent* event) {
+ui::EventResult AcceleratorFilter::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult AcceleratorFilter::PreHandleGestureEvent(
-    aura::Window* target,
-    ui::GestureEvent* event) {
+ui::EventResult AcceleratorFilter::OnGestureEvent(ui::GestureEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
index d8110b1..e9ac992 100644
--- a/ash/accelerators/accelerator_filter.h
+++ b/ash/accelerators/accelerator_filter.h
@@ -5,32 +5,27 @@
 #ifndef ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_FILTER_H_
 
+#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/aura/event_filter.h"
-#include "ash/ash_export.h"
+#include "ui/base/events/event_handler.h"
 
 namespace ash {
 namespace internal {
 
 // AcceleratorFilter filters key events for AcceleratorControler handling global
 // keyboard accelerators.
-class ASH_EXPORT AcceleratorFilter : public aura::EventFilter {
+class ASH_EXPORT AcceleratorFilter : public ui::EventHandler {
  public:
   AcceleratorFilter();
   virtual ~AcceleratorFilter();
 
-  // Overridden from aura::EventFilter:
-  virtual bool PreHandleKeyEvent(aura::Window* target,
-                                 ui::KeyEvent* event) OVERRIDE;
-  virtual bool PreHandleMouseEvent(aura::Window* target,
-                                   ui::MouseEvent* event) OVERRIDE;
-  virtual ui::EventResult PreHandleTouchEvent(
-      aura::Window* target,
-      ui::TouchEvent* event) OVERRIDE;
-  virtual ui::EventResult PreHandleGestureEvent(
-      aura::Window* target,
-      ui::GestureEvent* event) OVERRIDE;
+  // Overridden from ui::EventHandler:
+  virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
+  virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
+  virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);