Added touch HUD for all displays

Previously, there was only one touch HUD for the primary display and
other displays had none. Now each display gets its own touch HUD when
added.

BUG=172237


Review URL: https://chromiumcodereview.appspot.com/13106004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191635 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index d10c6b1..ea3f316 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -46,6 +46,7 @@ class ShelfLayoutManager;
 class StatusAreaWidget;
 class SystemBackgroundController;
 class SystemModalContainerLayoutManager;
+class TouchObserverHUD;
 class WorkspaceController;
 
 // This class maintains the per root window state for ash. This class
@@ -84,6 +85,13 @@ class ASH_EXPORT RootWindowController {
   // NULL if no such shelf exists.
   ShelfWidget* shelf() { return shelf_.get(); }
 
+  TouchObserverHUD* touch_observer_hud() { return touch_observer_hud_.get(); }
+
+  // Sets the touch HUD for this root window controller and adds it as a
+  // pre-target handler to the root window. Also, removes the previous touch
+  // HUD, if any, from pre-target handlers.
+  void SetTouchObserverHUD(TouchObserverHUD* hud);
+
   // Access the shelf layout manager associated with this root
   // window controller, NULL if no such shelf exists.
   ShelfLayoutManager* GetShelfLayoutManager();
@@ -183,6 +191,9 @@ class ASH_EXPORT RootWindowController {
   scoped_ptr<ScreenDimmer> screen_dimmer_;
   scoped_ptr<WorkspaceController> workspace_controller_;
 
+  // Heads-up display for touch events.
+  scoped_ptr<TouchObserverHUD> touch_observer_hud_;
+
   // We need to own event handlers for various containers.
   scoped_ptr<ToplevelWindowEventHandler> default_container_handler_;
   scoped_ptr<ToplevelWindowEventHandler> always_on_top_container_handler_;