Revert 137549 because it broke win_aura and linux_chromeos_clang compile.

ash/shell.h

Index: ash/shell.h
===================================================================
--- ash/shell.h	(revision 137550)
+++ ash/shell.h	(working copy)
@@ -86,7 +86,6 @@
 class SystemGestureEventFilter;
 class StackingController;
 class TooltipController;
-class TouchObserverHUD;
 class VisibilityController;
 class WindowModalityController;
 class WorkspaceController;
@@ -369,10 +368,6 @@
   // An event filter that pre-handles all key events to send them to an IME.
   scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_;
 
-  // An event filter that silently keeps track of all touch events and controls
-  // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
-  scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
-
   // The shelf for managing the launcher and the status widget in non-compact
   // mode. Shell does not own the shelf. Instead, it is owned by container of
   // the status area.
Property changes on: ash/shell.h
___________________________________________________________________
Deleted: svn:mergeinfo