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

ash/wm/power_button_controller.h

Index: ash/wm/power_button_controller.h
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index 5c7de09d1ecd6ff68f3da49d90d4ff4a3622a1dc..864abcc82956e38d80c126b0128926f136bf17d7 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-#include "chromeos/display/output_configurator.h"
+#include "ui/display/chromeos/output_configurator.h"
 #endif
 
 namespace gfx {
@@ -36,9 +36,9 @@ class ASH_EXPORT PowerButtonController
 // TODO(derat): Remove these ifdefs after OutputConfigurator becomes
 // cross-platform.
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-    : public chromeos::OutputConfigurator::Observer
+    : public ui::OutputConfigurator::Observer
 #endif
-    {
+      {
  public:
   explicit PowerButtonController(LockStateController* controller);
   virtual ~PowerButtonController();
@@ -55,10 +55,9 @@ class ASH_EXPORT PowerButtonController
   void OnLockButtonEvent(bool down, const base::TimeTicks& timestamp);
 
 #if defined(OS_CHROMEOS) && defined(USE_X11)
-  // 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
 
  private: