diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 23:01:02 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 23:01:02 +0000 |
| commit | 342d56a8e60d1196cefc0309fc0e261e1e13c877 (patch) | |
| tree | 32f7ab2303841a292320b5c43ef474f57cd828f6 /ash/shell.cc | |
| parent | f192ad752feea9d3ff275bc955b932add56b3fdd (diff) | |
| download | chromium_src-342d56a8e60d1196cefc0309fc0e261e1e13c877.zip chromium_src-342d56a8e60d1196cefc0309fc0e261e1e13c877.tar.gz chromium_src-342d56a8e60d1196cefc0309fc0e261e1e13c877.tar.bz2 | |
Revert 242116 "Use a single ToplevelWindowEventHandler for the a..."
> Use a single ToplevelWindowEventHandler for the ash::Shell. This is part 1 in disabling the few cases in which dragging multiple windows is possible (which causes crashiness)
>
> BUG=324038
> TEST=None
>
> Review URL: https://codereview.chromium.org/114643003
TBR=pkotwicz@chromium.org
Review URL: https://codereview.chromium.org/115693009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index ded8d84..42c1f77 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -71,7 +71,6 @@ #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" @@ -609,14 +608,12 @@ Shell::~Shell() { 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()); @@ -679,7 +676,6 @@ Shell::~Shell() { 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 @@ -830,10 +826,6 @@ void Shell::Init() { 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()); @@ -992,8 +984,6 @@ void Shell::InitRootWindow(aura::Window* root_window) { 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, |