Index: ash/root_window_controller.h |
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h |
index 6e2d5454427aa4ab65c8df0ffd8209c3a2d0547a..6d5c61d2cc9848ca69f8d171d60d494c66b403ce 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; |
@@ -299,13 +303,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 events for the panel container. |
+ scoped_ptr<ui::EventHandler> panel_container_handler_; |
scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_; |
scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_; |