Refactoring display configuration state to allow generic state objects

chromeos/chromeos.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,
   },
   'includes': [
     'chromeos_memory.gypi',
     'chromeos_tools.gypi',
   ],
   'targets': [
     {
       'target_name': 'chromeos',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
         '../components/components.gyp:onc_component',
         '../crypto/crypto.gyp:crypto',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../dbus/dbus.gyp:dbus',
         '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/libxml/libxml.gyp:libxml',
         '../ui/display/display.gyp:display',
+        '../ui/gfx/gfx.gyp:gfx_geometry',

[Daniel Erat, 2014/03/05 01:56:12]

i don't think that ui/gfx is currently permitted by chromeos/DEPS, but hopefully
it's okay to add...

[dnicoara, 2014/03/05 17:29:25]

Last time I spoke with oshima@ about this, he said it should be fine to add a
dependency on gfx_geometry. I'm adding him to the reviews to confirm.

Also, I should talk to ben@ about moving ui/gfx/geometry out since it is just a
bunch of utility classes with no dependencies to ui/gfx.

Also, I think I found a loop-hole since presubmit didn't complain since
ui/display depends on ui/gfx/geometry and including display_mode.h and
display_snapshot.h brings in the geometry includes.

         '../url/url.gyp:url_lib',
         'ime/input_method.gyp:gencode',
         'power_manager_proto',
       ],
       'defines': [
         'CHROMEOS_IMPLEMENTATION',
       ],
       'sources': [
         'app_mode/kiosk_oem_manifest_parser.cc',
         'app_mode/kiosk_oem_manifest_parser.h',
@@ skipping 159 matching lines @@
         'dbus/sms_client.cc',
         'dbus/sms_client.h',
         'dbus/system_clock_client.cc',
         'dbus/system_clock_client.h',
         'dbus/update_engine_client.cc',
         'dbus/update_engine_client.h',
         'dbus/volume_state.cc',
         'dbus/volume_state.h',
         'disks/disk_mount_manager.cc',
         'disks/disk_mount_manager.h',
-        'display/native_display_delegate.h',
-        'display/native_display_delegate_x11.cc',
-        'display/native_display_delegate_x11.h',
-        'display/native_display_event_dispatcher_x11.cc',
-        'display/native_display_event_dispatcher_x11.h',
-        'display/native_display_observer.h',
         'display/output_configurator.cc',
         'display/output_configurator.h',
-        'display/output_util.cc',
-        'display/output_util.h',
         'display/touchscreen_delegate_x11.cc',
         'display/touchscreen_delegate_x11.h',
         'ime/component_extension_ime_manager.cc',
         'ime/component_extension_ime_manager.h',
         'ime/extension_ime_util.cc',
         'ime/extension_ime_util.h',
         'ime/fake_xkeyboard.cc',
         'ime/fake_xkeyboard.h',
         'ime/composition_text.cc',
         'ime/composition_text.h',
@@ skipping 116 matching lines @@
         'tpm_token_loader.cc',
         'tpm_token_loader.h'
       ],
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
             '../build/linux/system.gyp:glib',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xi',
-            '../build/linux/system.gyp:xrandr',
           ],
         }, {
           # use_x11 == 0
           'sources!': [
             'ime/xkeyboard.cc',
             'ime/xkeyboard.h',
             'display/output_configurator.cc',
             'display/output_configurator.h',
-            'display/output_util.cc',
-            'display/output_util.h',
-            'display/real_output_configurator_delegate.cc',
-            'display/real_output_configurator_delegate.h',
             'ime/xkeyboard.cc',
             'ime/xkeyboard.h',
           ],
         }],
       ],
     },
     {
       # This target contains mocks that can be used to write unit tests.
       'target_name': 'chromeos_test_support',
       'type': 'static_library',
@@ skipping 76 matching lines @@
         '../base/base.gyp:test_support_base',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../components/components.gyp:onc_component',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../ui/display/display.gyp:display',
+        '../ui/display/display.gyp:display_test_util',
+        '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'chromeos_test_support',
         'power_manager_proto',
       ],
       'sources': [
         'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'attestation/attestation_flow_unittest.cc',
         'audio/cras_audio_handler_unittest.cc',
         'cert_loader_unittest.cc',
         'cryptohome/system_salt_getter_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/cros_disks_client_unittest.cc',
         'dbus/gsm_sms_client_unittest.cc',
         'dbus/introspectable_client_unittest.cc',
         'dbus/modem_messaging_client_unittest.cc',
         'dbus/nfc_client_unittest.cc',
         'dbus/power_policy_controller_unittest.cc',
         'dbus/shill_client_unittest_base.cc',
         'dbus/shill_client_unittest_base.h',
         'dbus/shill_device_client_unittest.cc',
         'dbus/shill_ipconfig_client_unittest.cc',
         'dbus/shill_manager_client_unittest.cc',
         'dbus/shill_profile_client_unittest.cc',
         'dbus/shill_service_client_unittest.cc',
         'disks/disk_mount_manager_unittest.cc',
-        'display/native_display_event_dispatcher_x11_unittest.cc',
         'display/output_configurator_unittest.cc',
-        'display/output_util_unittest.cc',
         'ime/component_extension_ime_manager_unittest.cc',
         'ime/extension_ime_util_unittest.cc',
         'ime/composition_text_unittest.cc',
         'ime/input_method_manager.h',
         'ime/input_method_whitelist_unittest.cc',
         'ime/xkeyboard_unittest.cc',
         'login/login_state_unittest.cc',
         'network/client_cert_resolver_unittest.cc',
         'network/geolocation_handler_unittest.cc',
         'network/managed_network_configuration_handler_unittest.cc',
@@ skipping 45 matching lines @@
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }