aura: Start converting event-filters into event-handlers.

ui/aura/env.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_ENV_H_
 #define UI_AURA_ENV_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/client/stacking_client.h"
+#include "ui/base/events/event_handler.h"
 #include "ui/gfx/point.h"
 
 #if defined(USE_X11)
 #include "ui/aura/device_list_updater_aurax11.h"
 #endif
 
 namespace aura {
 class EnvObserver;
 class EventFilter;
 class DisplayManager;
@@ skipping 50 matching lines @@
   client::StackingClient* stacking_client() { return stacking_client_; }
   void set_stacking_client(client::StackingClient* stacking_client) {
     stacking_client_ = stacking_client;
   }
 
   // Gets/sets DisplayManager. The DisplayManager's ownership is
   // transfered.
   DisplayManager* display_manager() { return display_manager_.get(); }
   void SetDisplayManager(DisplayManager* display_manager);
 
-  // Env takes ownership of the EventFilter.
-  EventFilter* event_filter() { return event_filter_.get(); }
-  void SetEventFilter(EventFilter* event_filter);
+  // Add event handler for pre-target of post-target phases.
+  void AddPreTargetEventHandler(ui::EventHandler* handler);

[Ben Goodger (Google), 2012/09/20 21:29:48]

qq: could Env be an EventTarget with a NULL target_handler_?

[sadrul, 2012/09/20 22:33:31]

Oh, very interesting. I made this change (RootWindow::GetParentTarget returns
Env, and the rest of the things are auto-taken care of). Thanks for the idea!

+  void RemovePreTargetEventHandler(ui::EventHandler* handler);
+  void AddPostTargetEventHandler(ui::EventHandler* handler);
+  void RemovePostTargetEventHandler(ui::EventHandler* handler);
+
+  const ui::EventHandlerList& pre_target_handlers() const {
+    return pre_target_handlers_;
+  }
 
   // Returns the native event dispatcher. The result should only be passed to
   // base::RunLoop(dispatcher), or used to dispatch an event by
   // |Dispatch(const NativeEvent&)| on it. It must never be stored.
 #if !defined(OS_MACOSX)
   MessageLoop::Dispatcher* GetDispatcher();
 #endif
 
  private:
   friend class Window;
@@ skipping 12 matching lines @@
   int mouse_button_flags_;
   // Location of last mouse event, in screen coordinates.
   gfx::Point last_mouse_location_;
   // If the cursor is hidden, saves the previous last_mouse_position.
   gfx::Point hidden_cursor_location_;
   bool is_cursor_hidden_;
   bool is_touch_down_;
   bool render_white_bg_;
   client::StackingClient* stacking_client_;
   scoped_ptr<DisplayManager> display_manager_;
-  scoped_ptr<EventFilter> event_filter_;
+
+  ui::EventHandlerList pre_target_handlers_;
+  ui::EventHandlerList post_target_handlers_;
 
 #if defined(USE_X11)
   scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
   DeviceListUpdaterAuraX11 device_list_updater_aurax11_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Env);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ENV_H_