Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

ash/ash.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # These files lists are shared with the GN build.
     'ash_sources': [
       'accelerators/accelerator_commands.cc',
@@ skipping 56 matching lines @@
       'display/display_change_observer_chromeos.cc',
       'display/display_change_observer_chromeos.h',
       'display/display_color_manager_chromeos.cc',
       'display/display_color_manager_chromeos.h',
       'display/window_tree_host_manager.cc',
       'display/window_tree_host_manager.h',
       'display/display_error_observer_chromeos.cc',
       'display/display_error_observer_chromeos.h',
       'display/display_info.cc',
       'display/display_info.h',
-      'display/display_layout.cc',
-      'display/display_layout.h',
-      'display/display_layout_builder.cc',
-      'display/display_layout_builder.h',
       'display/display_layout_store.cc',
       'display/display_layout_store.h',
       'display/display_manager.cc',
       'display/display_manager.h',
       'display/display_configuration_controller.cc',
       'display/display_configuration_controller.h',
       'display/display_pref_util.h',
       'display/display_util.cc',
       'display/display_util.h',
       'display/extended_mouse_warp_controller.cc',
@@ skipping 731 matching lines @@
       'content/display/screen_orientation_controller_chromeos_unittest.cc',
       'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
       'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
       'desktop_background/desktop_background_controller_unittest.cc',
       'dip_unittest.cc',
       'display/cursor_window_controller_unittest.cc',
       'display/display_change_observer_chromeos_unittest.cc',
       'display/display_color_manager_chromeos_unittest.cc',
       'display/display_error_observer_chromeos_unittest.cc',
       'display/display_info_unittest.cc',
-      'display/display_layout_builder_unittest.cc',
       'display/display_manager_unittest.cc',
       'display/display_util_unittest.cc',
       'display/extended_mouse_warp_controller_unittest.cc',
       'display/json_converter_unittest.cc',
       'display/mirror_window_controller_unittest.cc',
       'display/mouse_cursor_event_filter_unittest.cc',
       'display/projecting_observer_chromeos_unittest.cc',
       'display/resolution_notification_controller_unittest.cc',
       'display/root_window_transformers_unittest.cc',
       'display/screen_ash_unittest.cc',
@@ skipping 128 matching lines @@
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_data_pack',
         '../ui/compositor/compositor.gyp:compositor',
+        '../ui/display/display.gyp:display',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_base',
         '../ui/events/events.gyp:gesture_detection',
         '../ui/events/platform/events_platform.gyp:events_platform',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/gfx/gfx.gyp:gfx_vector_icons',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/message_center/message_center.gyp:message_center',
@@ skipping 40 matching lines @@
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             # Ash #includes power_supply_properties.pb.h directly.
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../components/components.gyp:quirks',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../third_party/qcms/qcms.gyp:qcms',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
-            '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_util',
           ],
         }, { # else: chromeos!=1
           'sources!': [
             'accelerators/key_hold_detector.cc',
             'accelerators/key_hold_detector.h',
             'accelerators/magnifier_key_scroller.cc',
             'accelerators/magnifier_key_scroller.h',
             'accelerators/spoken_feedback_toggler.cc',
             'accelerators/spoken_feedback_toggler.h',
@@ skipping 117 matching lines @@
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/app_list/app_list.gyp:app_list',
         '../ui/aura/aura.gyp:aura',
         '../ui/aura/aura.gyp:aura_test_support',
         '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/base/ui_base.gyp:ui_base_test_support',
         '../ui/compositor/compositor.gyp:compositor',
         '../ui/compositor/compositor.gyp:compositor_test_support',
+        '../ui/display/display.gyp:display',
         '../ui/events/devices/events_devices.gyp:events_devices',
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_test_support',
         '../ui/events/events.gyp:gesture_detection',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
         '../ui/keyboard/keyboard.gyp:keyboard_with_content',
         '../ui/message_center/message_center.gyp:message_center',
         '../ui/message_center/message_center.gyp:message_center_test_support',
@@ skipping 41 matching lines @@
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
             '../chromeos/chromeos.gyp:power_manager_proto',
             '../components/components.gyp:quirks',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../ui/display/display.gyp:display',
             '../ui/display/display.gyp:display_test_support',
             '../ui/display/display.gyp:display_test_util',
             '../ui/display/display.gyp:display_types',
           ],
           'sources': [
             'first_run/first_run_helper_unittest.cc',
           ],
         }, { # else: chromeos!=1
           'sources!': [
             'accelerators/magnifier_key_scroller_unittest.cc',
@@ skipping 115 matching lines @@
                   '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }],
   ],
 }