[WIP][Ozone] Support external touchscreens

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 9e6e046ccefe55dad3ac68dbff0b82e6b2bbf7b8..8dbe5453d83688ac386fa264ec86d1e18036f784 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -138,6 +138,7 @@ class SystemTrayDelegate;
 class SystemTrayNotifier;
 class ToplevelWindowEventHandler;
 class TouchTransformerController;
+class TouchTransformerControllerOzone;
 class TouchObserverHUD;
 class UserActivityDetector;
 class UserWallpaperDelegate;
@@ -384,7 +385,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   DisplayController* display_controller() {
     return display_controller_.get();
   }
-#if defined(OS_CHROMEOS) && defined(USE_X11)
+#if defined(OS_CHROMEOS)
   TouchTransformerController* touch_transformer_controller() {
     return touch_transformer_controller_.get();
   }
@@ -729,10 +730,11 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   // Listens for output changes and updates the display manager.
   scoped_ptr<DisplayChangeObserver> display_change_observer_;
 
+  scoped_ptr<TouchTransformerController> touch_transformer_controller_;
+
 #if defined(USE_X11)
   scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
   scoped_ptr<ui::EventHandler> speech_feedback_handler_;
-  scoped_ptr<TouchTransformerController> touch_transformer_controller_;
 #endif  // defined(USE_X11)
 #endif  // defined(OS_CHROMEOS)