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

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 165 matching lines @@
     Shell::TestApi::screen_position_controller() {
   return shell_->screen_position_controller_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, public:
 
 Shell::Shell(ShellDelegate* delegate)
     : screen_(new ScreenAsh),
       active_root_window_(NULL),
-      env_filter_(NULL),
       delegate_(delegate),
 #if defined(OS_CHROMEOS)
       output_configurator_(new chromeos::OutputConfigurator()),
       output_configurator_animation_(
           new internal::OutputConfiguratorAnimation()),
 #endif  // defined(OS_CHROMEOS)
       shelf_(NULL),
       panel_layout_manager_(NULL),
       status_area_widget_(NULL),
       browser_context_(NULL) {
@@ skipping 157 matching lines @@
   if (container)
     containers.push_back(container);
   return containers;
 }
 
 void Shell::Init() {
   // Install the custom factory first so that views::FocusManagers for Tray,
   // Launcher, and WallPaper could be created by the factory.
   views::FocusManagerFactory::Install(new AshFocusManagerFactory);
 
-  env_filter_ = new aura::shared::CompoundEventFilter;
-  // Pass ownership of the filter to the Env.
-  aura::Env::GetInstance()->SetEventFilter(env_filter_);
+  env_filter_.reset(new aura::shared::CompoundEventFilter);
+  AddEnvEventFilter(env_filter_.get());
 
   cursor_manager_.set_delegate(this);
 
   focus_manager_.reset(new aura::FocusManager);
   activation_controller_.reset(
       new internal::ActivationController(focus_manager_.get()));
 
   screen_position_controller_.reset(new internal::ScreenPositionController);
   display_controller_.reset(new DisplayController);
   display_controller_->InitPrimaryDisplay();
   aura::RootWindow* root_window = display_controller_->GetPrimaryRootWindow();
   active_root_window_ = root_window;
 
   cursor_manager_.SetDeviceScaleFactor(
       root_window->AsRootWindowHostDelegate()->GetDeviceScaleFactor());
 
 #if !defined(OS_MACOSX)
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   accelerator_controller_.reset(new AcceleratorController);
 #endif
   shell_context_menu_.reset(new internal::ShellContextMenu);
 
   // The order in which event filters are added is significant.
-  DCHECK(!GetEnvEventFilterCount());
   user_activity_detector_.reset(new UserActivityDetector);
   AddEnvEventFilter(user_activity_detector_.get());
 
-  DCHECK_EQ(1U, GetEnvEventFilterCount());
   event_rewriter_filter_.reset(new internal::EventRewriterEventFilter);
   AddEnvEventFilter(event_rewriter_filter_.get());
 
-  DCHECK_EQ(2U, GetEnvEventFilterCount());
   overlay_filter_.reset(new internal::OverlayEventFilter);
   AddEnvEventFilter(overlay_filter_.get());
   AddShellObserver(overlay_filter_.get());
 
-  DCHECK_EQ(3U, GetEnvEventFilterCount());
   input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
   AddEnvEventFilter(input_method_filter_.get());
 
 #if !defined(OS_MACOSX)
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddEnvEventFilter(accelerator_filter_.get());
 #endif
 
   system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
   AddEnvEventFilter(system_gesture_filter_.get());
@@ skipping 85 matching lines @@
   user_wallpaper_delegate_->InitializeWallpaper();
 
   power_button_controller_.reset(new PowerButtonController);
   AddShellObserver(power_button_controller_.get());
 
   if (initially_hide_cursor_)
     cursor_manager_.ShowCursor(false);
 }
 
 void Shell::AddEnvEventFilter(aura::EventFilter* filter) {
-  env_filter_->AddFilter(filter);
+  aura::Env::GetInstance()->AddPreTargetEventHandler(filter);
 }
 
 void Shell::RemoveEnvEventFilter(aura::EventFilter* filter) {
-  env_filter_->RemoveFilter(filter);
-}
-
-size_t Shell::GetEnvEventFilterCount() const {
-  return env_filter_->GetFilterCount();
+  aura::Env::GetInstance()->RemovePreTargetEventHandler(filter);
 }
 
 void Shell::ShowBackgroundMenu(views::Widget* widget,
                                const gfx::Point& location) {
   // No context menus if user have not logged in.
   if (!delegate_.get() || !delegate_->IsUserLoggedIn())
     return;
   // No context menus when screen is locked.
   if (IsScreenLocked())
     return;
@@ skipping 245 matching lines @@
 }
 
 void Shell::ShowCursor(bool visible) {
   RootWindowList root_windows = GetAllRootWindows();
   for (RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter)
     (*iter)->ShowCursor(visible);
 }
 
 }  // namespace ash