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

ui/display/BUILD.gn

Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 12ba33e3ca8ae7fb24e357682c9578e175630337..37af5ba2be7de1eab983a683762cc879372632a0 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -7,23 +7,6 @@ import("//testing/test.gni")
 
 component("display") {
   sources = [
-    "chromeos/apply_content_protection_task.cc",
-    "chromeos/apply_content_protection_task.h",
-    "chromeos/configure_displays_task.cc",
-    "chromeos/configure_displays_task.h",
-    "chromeos/display_configurator.cc",
-    "chromeos/display_configurator.h",
-    "chromeos/display_layout_manager.h",
-    "chromeos/display_snapshot_virtual.cc",
-    "chromeos/display_snapshot_virtual.h",
-    "chromeos/display_util.cc",
-    "chromeos/display_util.h",
-    "chromeos/query_content_protection_task.cc",
-    "chromeos/query_content_protection_task.h",
-    "chromeos/touchscreen_util.cc",
-    "chromeos/touchscreen_util.h",
-    "chromeos/update_display_configuration_task.cc",
-    "chromeos/update_display_configuration_task.h",
     "display.cc",
     "display.h",
     "display_change_notifier.cc",
@@ -31,6 +14,10 @@ component("display") {
     "display_export.h",
     "display_finder.cc",
     "display_finder.h",
+    "display_layout.cc",
+    "display_layout.h",
+    "display_layout_builder.cc",
+    "display_layout_builder.h",
     "display_list.cc",
     "display_list.h",
     "display_observer.cc",
@@ -43,18 +30,6 @@ component("display") {
     "fake_display_snapshot.h",
     "ios/screen_ios.mm",
     "mac/screen_mac.mm",
-    "manager/display_layout.cc",
-    "manager/display_layout.h",
-    "manager/display_layout_builder.cc",
-    "manager/display_layout_builder.h",
-    "manager/display_layout_store.cc",
-    "manager/display_layout_store.h",
-    "manager/display_manager.cc",
-    "manager/display_manager.h",
-    "manager/display_manager_utilities.cc",
-    "manager/display_manager_utilities.h",
-    "manager/managed_display_info.cc",
-    "manager/managed_display_info.h",
     "screen.cc",
     "screen.h",
     "screen_aura.cc",
@@ -83,39 +58,10 @@ component("display") {
     "//base",
     "//third_party/re2",
     "//ui/display/util",
-    "//ui/events/devices",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
-  if (is_chromeos && use_x11) {
-    sources += [
-      "chromeos/x11/display_mode_x11.cc",
-      "chromeos/x11/display_mode_x11.h",
-      "chromeos/x11/display_snapshot_x11.cc",
-      "chromeos/x11/display_snapshot_x11.h",
-      "chromeos/x11/display_util_x11.cc",
-      "chromeos/x11/display_util_x11.h",
-      "chromeos/x11/native_display_delegate_x11.cc",
-      "chromeos/x11/native_display_delegate_x11.h",
-      "chromeos/x11/native_display_event_dispatcher_x11.cc",
-      "chromeos/x11/native_display_event_dispatcher_x11.h",
-    ]
-
-    configs += [
-      "//build/config/linux:x11",
-      "//build/config/linux:xext",
-      "//build/config/linux:xi",
-      "//build/config/linux:xrandr",
-    ]
-
-    deps += [ "//ui/events/platform" ]
-  }
-
-  if (use_x11) {
-    deps += [ "//ui/gfx/x" ]
-  }
-
   if (!use_aura) {
     sources -= [ "screen_aura.cc" ]
   }
@@ -138,7 +84,7 @@ component("display_manager_test_api") {
   defines = [ "DISPLAY_IMPLEMENTATION" ]
 
   public_deps = [
-    ":display",
+    "//ui/display/manager",
   ]
 
   deps = [
@@ -151,14 +97,14 @@ component("display_manager_test_api") {
 static_library("test_support") {
   testonly = true
   sources = [
-    "chromeos/test/action_logger.cc",
-    "chromeos/test/action_logger.h",
-    "chromeos/test/action_logger_util.cc",
-    "chromeos/test/action_logger_util.h",
-    "chromeos/test/test_display_layout_manager.cc",
-    "chromeos/test/test_display_layout_manager.h",
-    "chromeos/test/test_native_display_delegate.cc",
-    "chromeos/test/test_native_display_delegate.h",
+    "manager/chromeos/test/action_logger.cc",
+    "manager/chromeos/test/action_logger.h",
+    "manager/chromeos/test/action_logger_util.cc",
+    "manager/chromeos/test/action_logger_util.h",
+    "manager/chromeos/test/test_display_layout_manager.cc",
+    "manager/chromeos/test/test_display_layout_manager.h",
+    "manager/chromeos/test/test_native_display_delegate.cc",
+    "manager/chromeos/test/test_native_display_delegate.h",
     "test/display_matchers.cc",
     "test/display_matchers.h",
     "test/display_test_util.h",
@@ -170,6 +116,7 @@ static_library("test_support") {
 
   public_deps = [
     ":display",
+    "//ui/display/manager",
   ]
   deps = [
     "//base",
@@ -184,16 +131,16 @@ static_library("test_support") {
 # This test covers all testable components in display.
 test("display_unittests") {
   sources = [
-    "chromeos/apply_content_protection_task_unittest.cc",
-    "chromeos/configure_displays_task_unittest.cc",
-    "chromeos/display_configurator_unittest.cc",
-    "chromeos/query_content_protection_task_unittest.cc",
-    "chromeos/touchscreen_util_unittest.cc",
-    "chromeos/update_display_configuration_task_unittest.cc",
     "display_change_notifier_unittest.cc",
     "display_list_unittest.cc",
     "display_unittest.cc",
     "fake_display_snapshot_unittests.cc",
+    "manager/chromeos/apply_content_protection_task_unittest.cc",
+    "manager/chromeos/configure_displays_task_unittest.cc",
+    "manager/chromeos/display_configurator_unittest.cc",
+    "manager/chromeos/query_content_protection_task_unittest.cc",
+    "manager/chromeos/touchscreen_util_unittest.cc",
+    "manager/chromeos/update_display_configuration_task_unittest.cc",
     "manager/display_layout_builder_unittest.cc",
     "manager/display_layout_unittest.cc",
     "manager/display_manager_utilities_unittest.cc",
@@ -214,6 +161,7 @@ test("display_unittests") {
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
+    "//ui/display/manager",
     "//ui/display/types",
     "//ui/display/util",
     "//ui/events/devices",
@@ -229,8 +177,8 @@ test("display_unittests") {
 
   if (is_chromeos && use_x11) {
     sources += [
-      "chromeos/x11/display_util_x11_unittest.cc",
-      "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
+      "manager/chromeos/x11/display_util_x11_unittest.cc",
+      "manager/chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
     ]
   }
 }