[Aura] Support additonal event filters in DesktopEventFilter.

ui/aura/event_filter_unittest.cc

 // Copyright (c) 2011 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/event_filter.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
+#include "ui/aura/test/test_event_filter.h"
 #include "ui/aura/test/test_window_delegate.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
 #if defined(CreateWindow)
 #undef CreateWindow
 #endif
 #endif
 
 namespace aura {
@@ skipping 44 matching lines @@
 Window* CreateWindow(int id, Window* parent, WindowDelegate* delegate) {
   Window* window = new Window(delegate ? delegate : new TestWindowDelegate);
   window->set_id(id);
   window->Init(ui::Layer::LAYER_HAS_TEXTURE);
   window->SetParent(parent);
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->Show();
   return window;
 }
 
-class TestEventFilter : public EventFilter {
- public:
-  explicit TestEventFilter(Window* owner)
-      : EventFilter(owner),
-        key_event_count_(0),
-        mouse_event_count_(0),
-        touch_event_count_(0),
-        consumes_key_events_(false),
-        consumes_mouse_events_(false),
-        consumes_touch_events_(false) {
-  }
-  virtual ~TestEventFilter() {}
-
-  void ResetCounts() {
-    key_event_count_ = 0;
-    mouse_event_count_ = 0;
-    touch_event_count_ = 0;
-  }
-
-  int key_event_count() const { return key_event_count_; }
-  int mouse_event_count() const { return mouse_event_count_; }
-  int touch_event_count() const { return touch_event_count_; }
-
-  void set_consumes_key_events(bool consumes_key_events) {
-    consumes_key_events_ = consumes_key_events;
-  }
-  void set_consumes_mouse_events(bool consumes_mouse_events) {
-    consumes_mouse_events_ = consumes_mouse_events;
-  }
-  void set_consumes_touch_events(bool consumes_touch_events) {
-    consumes_touch_events_ = consumes_touch_events;
-  }
-
-  // Overridden from EventFilter:
-  virtual bool PreHandleKeyEvent(Window* target, KeyEvent* event) OVERRIDE {
-    ++key_event_count_;
-    return consumes_key_events_;
-  }
-  virtual bool PreHandleMouseEvent(Window* target, MouseEvent* event) OVERRIDE {
-    ++mouse_event_count_;
-    return consumes_mouse_events_;
-  }
-  virtual ui::TouchStatus PreHandleTouchEvent(Window* target,
-                                              TouchEvent* event) OVERRIDE {
-    ++touch_event_count_;
-    // TODO(sadrul): !
-    return ui::TOUCH_STATUS_UNKNOWN;
-  }
-
- private:
-  int key_event_count_;
-  int mouse_event_count_;
-  int touch_event_count_;
-
-  bool consumes_key_events_;
-  bool consumes_mouse_events_;
-  bool consumes_touch_events_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestEventFilter);
-};
-
 // Creates this hierarchy:
 //
 // Desktop Window (EF)
 //  +- w1 (EF)
 //    +- w11
 //      +- w111 (EF)
 //        +- w1111 <-- target window
 TEST_F(EventFilterTest, Basic) {
   scoped_ptr<Window> w1(CreateWindow(1, Desktop::GetInstance(), NULL));
   scoped_ptr<Window> w11(CreateWindow(11, w1.get(), NULL));
@@ skipping 53 matching lines @@
   EXPECT_EQ(0, w111_filter->mouse_event_count());
   EXPECT_EQ(0, d1111->mouse_event_count());
   EXPECT_EQ(0, desktop_filter->touch_event_count());
   EXPECT_EQ(0, w1_filter->touch_event_count());
   EXPECT_EQ(0, w111_filter->touch_event_count());
   EXPECT_EQ(0, d1111->touch_event_count());
 }
 
 }  // namespace test
 }  // namespace aura