Use a single ToplevelWindowEventHandler for the ash::Shell

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/accelerator_controller.h"
@@ skipping 53 matching lines @@
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
+#include "ash/wm/toplevel_window_event_handler.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_positioner.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 517 matching lines @@
   // See bug crbug.com/134502.
   aura::client::GetFocusClient(GetPrimaryRootWindow())->FocusWindow(NULL);
 
   // Please keep in same order as in Init() because it's easy to miss one.
   if (window_modality_controller_)
     window_modality_controller_.reset();
   RemovePreTargetHandler(event_rewriter_filter_.get());
   RemovePreTargetHandler(user_activity_detector_.get());
   RemovePreTargetHandler(overlay_filter_.get());
   RemovePreTargetHandler(input_method_filter_.get());
+  RemovePreTargetHandler(accelerator_filter_.get());
+  RemovePreTargetHandler(event_transformation_handler_.get());
+  RemovePreTargetHandler(toplevel_window_event_handler_.get());
+  RemovePostTargetHandler(toplevel_window_event_handler_.get());
+  RemovePreTargetHandler(system_gesture_filter_.get());
+  RemovePreTargetHandler(keyboard_metrics_filter_.get());
   if (mouse_cursor_filter_)
     RemovePreTargetHandler(mouse_cursor_filter_.get());
-  RemovePreTargetHandler(system_gesture_filter_.get());
-  RemovePreTargetHandler(keyboard_metrics_filter_.get());
-  RemovePreTargetHandler(event_transformation_handler_.get());
-  RemovePreTargetHandler(accelerator_filter_.get());
 
   // TooltipController is deleted with the Shell so removing its references.
   RemovePreTargetHandler(tooltip_controller_.get());
 
   // AppList needs to be released before shelf layout manager, which is
   // destroyed with shelf container in the loop below. However, app list
   // container is now on top of shelf container and released after it.
   // TODO(xiyuan): Move it back when app list container is no longer needed.
   app_list_controller_.reset();
 
@@ skipping 42 matching lines @@
   system_tray_notifier_.reset();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical. TODO(oshima): sort.
   magnification_controller_.reset();
   partial_magnification_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
   nested_dispatcher_controller_.reset();
+  toplevel_window_event_handler_.reset();
   user_action_client_.reset();
   visibility_controller_.reset();
   // |shelf_item_delegate_manager_| observes |shelf_model_|. It must be
   // destroyed before |shelf_model_| is destroyed.
   shelf_item_delegate_manager_.reset();
   shelf_model_.reset();
 
   power_button_controller_.reset();
   lock_state_controller_.reset();
 
@@ skipping 130 matching lines @@
   input_method_filter_.reset(new views::corewm::InputMethodEventFilter(
       root_window->GetDispatcher()->host()->GetAcceleratedWidget()));
   AddPreTargetHandler(input_method_filter_.get());
 
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddPreTargetHandler(accelerator_filter_.get());
 
   event_transformation_handler_.reset(new internal::EventTransformationHandler);
   AddPreTargetHandler(event_transformation_handler_.get());
 
+  toplevel_window_event_handler_.reset(new ToplevelWindowEventHandler);
+  AddPreTargetHandler(toplevel_window_event_handler_.get());
+  AddPostTargetHandler(toplevel_window_event_handler_.get());
+
   system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
   AddPreTargetHandler(system_gesture_filter_.get());
 
   keyboard_metrics_filter_.reset(new internal::KeyboardUMAEventFilter);
   AddPreTargetHandler(keyboard_metrics_filter_.get());
 
   // The keyboard system must be initialized before the RootWindowController is
   // created.
   if (keyboard::IsKeyboardEnabled())
     keyboard::InitializeKeyboard();
@@ skipping 138 matching lines @@
   views::corewm::FocusController* focus_controller =
       static_cast<views::corewm::FocusController*>(activation_client_);
   root_window->AddPreTargetHandler(focus_controller);
   aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
   aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
   aura::client::SetScreenPositionClient(root_window,
                                         screen_position_controller_.get());
   aura::client::SetCursorClient(root_window, &cursor_manager_);
   aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
   aura::client::SetEventClient(root_window, event_client_.get());
+  aura::client::SetWindowMoveClient(root_window,
+      toplevel_window_event_handler_.get());
 
   if (nested_dispatcher_controller_) {
     aura::client::SetDispatcherClient(root_window,
                                       nested_dispatcher_controller_.get());
   }
   if (user_action_client_)
     aura::client::SetUserActionClient(root_window, user_action_client_.get());
 }
 
 bool Shell::CanWindowReceiveEvents(aura::Window* window) {
@@ skipping 34 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash