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/root_window_controller.h | |
| 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/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index abe6ab9..3d6f2fd 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -42,10 +42,6 @@ namespace keyboard { class KeyboardController; } -namespace ui { -class EventHandler; -} - namespace ash { class ShelfWidget; class SoloWindowTracker; @@ -306,8 +302,13 @@ class ASH_EXPORT RootWindowController : public ShellObserver { TouchHudDebug* touch_hud_debug_; TouchHudProjection* touch_hud_projection_; - // Handles double clicks on the panel window header. - scoped_ptr<ui::EventHandler> panel_container_handler_; + // We need to own event handlers for various containers. + scoped_ptr<ToplevelWindowEventHandler> default_container_handler_; + scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_; + scoped_ptr<ToplevelWindowEventHandler> modal_container_handler_; + scoped_ptr<ToplevelWindowEventHandler> lock_modal_container_handler_; + scoped_ptr<ToplevelWindowEventHandler> panel_container_handler_; + scoped_ptr<ToplevelWindowEventHandler> docked_container_handler_; scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_; scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_; |