Move chromeos/display/* to ui/display/chromeos

ash/touch/touch_observer_hud.h

Index: ash/touch/touch_observer_hud.h
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index 4e74e760727fd25e2b8651e22d68c4a14ff55a8f..2ee52bdc96c9cd408226966021bbda0cc2744410 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -12,7 +12,7 @@
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/display/output_configurator.h"
+#include "ui/display/chromeos/output_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace views {
@@ -24,14 +24,13 @@ namespace internal {
 
 // An event filter which handles system level gesture events. Objects of this
 // class manage their own lifetime.
-class ASH_EXPORT TouchObserverHUD
-    : public ui::EventHandler,
-      public views::WidgetObserver,
-      public gfx::DisplayObserver,
+class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
+                                    public views::WidgetObserver,
+                                    public gfx::DisplayObserver,
 #if defined(OS_CHROMEOS)
-      public chromeos::OutputConfigurator::Observer,
+                                    public ui::OutputConfigurator::Observer,
 #endif  // defined(OS_CHROMEOS)
-      public DisplayController::Observer {
+                                    public DisplayController::Observer {
  public:
   // Called to clear touch points and traces from the screen. Default
   // implementation does nothing. Sub-classes should implement appropriately.
@@ -66,10 +65,9 @@ class ASH_EXPORT TouchObserverHUD
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
-  // Overriden from chromeos::OutputConfigurator::Observer.
-  virtual void OnDisplayModeChanged(
-      const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
-      OVERRIDE;
+  // Overriden from ui::OutputConfigurator::Observer.
+  virtual void OnDisplayModeChanged(const std::vector<
+      ui::OutputConfigurator::OutputSnapshot>& outputs) OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
 
   // Overriden form DisplayController::Observer.