Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: ash/root_window_controller.h

Issue 114643003: Use a single ToplevelWindowEventHandler for the ash::Shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index e71b1ad28ac8324f3bd67822ff02a1f49765fb91..635bf1a3d554b65ec1b3dd961d55094a2dfc88a3 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 events for the panel container.
oshima 2013/12/17 00:33:46 can you briefly mention why this still have to be
+ scoped_ptr<ui::EventHandler> panel_container_handler_;
scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_;

Powered by Google App Engine
This is Rietveld 408576698