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

ui/aura/env.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/env.h"
 
 #include "base/command_line.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/event_filter.h"
@@ skipping 79 matching lines @@
 }
 
 void Env::SetDisplayManager(DisplayManager* display_manager) {
   display_manager_.reset(display_manager);
 #if defined(USE_X11)
   // Update the display manager with latest info.
   display_change_observer_->NotifyDisplayChange();
 #endif
 }
 
-void Env::SetEventFilter(EventFilter* event_filter) {
-  event_filter_.reset(event_filter);
+void Env::AddPreTargetEventHandler(ui::EventHandler* handler) {
+  if (handler)
+    pre_target_handlers_.push_back(handler);
+}
+
+void Env::RemovePreTargetEventHandler(ui::EventHandler* handler) {
+  ui::EventHandlerList::iterator find =
+      std::find(pre_target_handlers_.begin(),
+                pre_target_handlers_.end(),
+                handler);
+  if (find != pre_target_handlers_.end())
+    pre_target_handlers_.erase(find);
+}
+
+void Env::AddPostTargetEventHandler(ui::EventHandler* handler) {
+  if (handler)
+    post_target_handlers_.push_back(handler);
+}
+
+void Env::RemovePostTargetEventHandler(ui::EventHandler* handler) {
+  ui::EventHandlerList::iterator find =
+      std::remove(post_target_handlers_.begin(),
+                  post_target_handlers_.end(),
+                  handler);
+  if (find != post_target_handlers_.end())
+    post_target_handlers_.erase(find);
 }
 
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
 #if defined(USE_X11)
   return base::MessagePumpAuraX11::Current();
 #else
   return dispatcher_.get();
 #endif
 }
@@ skipping 17 matching lines @@
   ui::Compositor::Initialize(
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUIEnableThreadedCompositing));
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 }  // namespace aura