diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:36:39 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 17:36:39 +0000 |
commit | 6c106d6fd7ae1401673774bdc884b615cd6d36df (patch) | |
tree | bb62f7318e6c10ac1099f5f10c71267bbb7acd26 /ash/root_window_controller.h | |
parent | 4a856bd7d23d27153ff8a5c5d943edd74bd155a6 (diff) | |
download | chromium_src-6c106d6fd7ae1401673774bdc884b615cd6d36df.zip chromium_src-6c106d6fd7ae1401673774bdc884b615cd6d36df.tar.gz chromium_src-6c106d6fd7ae1401673774bdc884b615cd6d36df.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242116 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, 6 insertions, 7 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 3d6f2fd..abe6ab9 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -42,6 +42,10 @@ namespace keyboard { class KeyboardController; } +namespace ui { +class EventHandler; +} + namespace ash { class ShelfWidget; class SoloWindowTracker; @@ -302,13 +306,8 @@ class ASH_EXPORT RootWindowController : public ShellObserver { TouchHudDebug* touch_hud_debug_; TouchHudProjection* touch_hud_projection_; - // 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_; + // Handles double clicks on the panel window header. + scoped_ptr<ui::EventHandler> panel_container_handler_; scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_; scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_; |