Split //ui/display and create //ui/display/manager.

ui/display/manager/chromeos/display_configurator.h

Index: ui/display/manager/chromeos/display_configurator.h
diff --git a/ui/display/chromeos/display_configurator.h b/ui/display/manager/chromeos/display_configurator.h
similarity index 96%
rename from ui/display/chromeos/display_configurator.h
rename to ui/display/manager/chromeos/display_configurator.h
index 64ac535b9acac6c3b64ee096675ece2c129c005e..cce56b0430e6da98b7a8cdce5f7f082e3d218172 100644
--- a/ui/display/chromeos/display_configurator.h
+++ b/ui/display/manager/chromeos/display_configurator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
-#define UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
+#ifndef UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
+#define UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
@@ -20,9 +20,9 @@
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/display/chromeos/display_snapshot_virtual.h"
-#include "ui/display/chromeos/query_content_protection_task.h"
-#include "ui/display/display_export.h"
+#include "ui/display/manager/chromeos/display_snapshot_virtual.h"
+#include "ui/display/manager/chromeos/query_content_protection_task.h"
+#include "ui/display/manager/display_manager_export.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/display/util/display_util.h"
@@ -41,7 +41,8 @@ class NativeDisplayDelegate;
 class UpdateDisplayConfigurationTask;
 
 // This class interacts directly with the system display configurator.
-class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
+class DISPLAY_MANAGER_EXPORT DisplayConfigurator
+    : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
   static const ContentProtectionClientId kInvalidClientId = 0;
@@ -81,8 +82,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
     // just-applied configuration. Note that the X server is no longer grabbed
     // when this method is called, so the actual configuration could've changed
     // already.
-    virtual void OnDisplayModeChanged(
-        const DisplayStateList& displays) {}
+    virtual void OnDisplayModeChanged(const DisplayStateList& displays) {}
 
     // Called after a display mode change attempt failed. |displays| contains
     // displays that are detected when failed.
@@ -93,8 +93,7 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
 
     // Called after the power state has been changed. |power_state| contains
     // the just-applied power state.
-    virtual void OnPowerStateChanged(
-        chromeos::DisplayPowerState power_state) {}
+    virtual void OnPowerStateChanged(chromeos::DisplayPowerState power_state) {}
   };
 
   // Interface for classes that make decisions about which display state
@@ -490,4 +489,4 @@ class DISPLAY_EXPORT DisplayConfigurator : public NativeDisplayObserver {
 
 }  // namespace ui
 
-#endif  // UI_DISPLAY_CHROMEOS_DISPLAY_CONFIGURATOR_H_
+#endif  // UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_