diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 05:45:31 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 05:45:31 +0000 |
commit | 3537d47b8e8f842d1c83a739e353ee9b97ee436f (patch) | |
tree | c7cfcace93e3c5e6b4db1f748e29d3188d28a375 /ash/root_window_controller.h | |
parent | c267f8362843a0d5ba47952f2ccd59bc3363e7ea (diff) | |
download | chromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.zip chromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.tar.gz chromium_src-3537d47b8e8f842d1c83a739e353ee9b97ee436f.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
R=oshima
TBR=sadrul (This is a reland of https://codereview.chromium.org/114643003)
Review URL: https://codereview.chromium.org/102253008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
-rw-r--r-- | ash/root_window_controller.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index 3ff7288..aa1ec2b 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -42,11 +42,14 @@ namespace keyboard { class KeyboardController; } +namespace ui { +class EventHandler; +} + namespace ash { class ShelfWidget; class StackingController; class SystemTray; -class ToplevelWindowEventHandler; namespace internal { @@ -297,13 +300,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_; |