ash: Get output info from chromeos instead of XRandR.

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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
@@ skipping 65 matching lines @@
         'desktop_background/desktop_background_controller.h',
         'desktop_background/desktop_background_controller_observer.h',
         'desktop_background/desktop_background_view.cc',
         'desktop_background/desktop_background_view.h',
         'desktop_background/desktop_background_widget_controller.cc',
         'desktop_background/desktop_background_widget_controller.h',
         'desktop_background/user_wallpaper_delegate.h',
         'desktop_background/wallpaper_resizer.cc',
         'desktop_background/wallpaper_resizer.h',
         'desktop_background/wallpaper_resizer_observer.h',
-        'display/display_change_observer_x11.cc',
-        'display/display_change_observer_x11.h',
+        'display/display_change_observer_chromeos.cc',
+        'display/display_change_observer_chromeos.h',
         'display/display_controller.cc',
         'display/display_controller.h',
-        'display/display_error_observer.cc',
-        'display/display_error_observer.h',
+        'display/display_error_observer_chromeos.cc',
+        'display/display_error_observer_chromeos.h',
         'display/display_info.h',
         'display/display_info.cc',
         'display/display_layout.h',
         'display/display_layout.cc',
         'display/display_layout_store.h',
         'display/display_layout_store.cc',
         'display/display_manager.cc',
         'display/display_manager.h',
         'display/display_pref_util.h',
-        'display/display_util_x11.cc',
-        'display/display_util_x11.h',
         'display/event_transformation_handler.cc',
         'display/event_transformation_handler.h',
         'display/mirror_window_controller.cc',
         'display/mirror_window_controller.h',
         'display/mouse_cursor_event_filter.cc',
         'display/mouse_cursor_event_filter.h',
         'display/output_configurator_animation.cc',
         'display/output_configurator_animation.h',
         'display/resolution_notification_controller.cc',
         'display/resolution_notification_controller.h',
@@ skipping 435 matching lines @@
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['OS!="linux"', {
           'sources/': [
             ['exclude', 'system/monitor/tray_monitor.cc'],
             ['exclude', 'system/monitor/tray_monitor.h'],
           ],
         }],
+        ['use_x11!=1', {

[oshima, 2013/08/19 20:00:24]

can you add rule in build/filename_rules.gypi instead?

Also shouldn't this be chromeos!=1?

[Daniel Erat, 2013/08/19 22:09:30]

_chromeos.* should already be filtered out of non-Chrome-OS builds. I have
use_x11 so that these files will additionally be excluded from non-X11 Chrome OS
builds (if we ever do such a thing). It doesn't look like we support e.g.
_chomeos_x11.*.

+          'sources/': [
+            ['exclude', 'display/display_change_observer_chromeos.cc'],
+            ['exclude', 'display/display_change_observer_chromeos.h'],
+            ['exclude', 'display/display_error_observer_chromeos.cc'],
+            ['exclude', 'display/display_error_observer_chromeos.h'],
+          ],
+        }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
             # Ash #includes power_supply_properties.pb.h directly.
             '../chromeos/chromeos.gyp:power_manager_proto',
           ],
         }, { # else: chromeos!=1
           'sources/': [
             ['exclude', '/chromeos/'],
-            ['exclude', 'display/display_error_observer.cc'],
-            ['exclude', 'display/display_error_observer.h'],
             ['exclude', 'display/output_configurator_animation.cc'],
             ['exclude', 'display/output_configurator_animation.h'],
           ],
         }],
       ],
     },
     {
       'target_name': 'ash_test_support',
       'type': 'static_library',
       'dependencies': [
@@ skipping 88 matching lines @@
         '../ui/views/test/test_views_delegate.cc',
         '../ui/views/test/test_views_delegate.h',
         'accelerators/accelerator_controller_unittest.cc',
         'accelerators/accelerator_filter_unittest.cc',
         'accelerators/accelerator_table_unittest.cc',
         'accelerators/nested_dispatcher_controller_unittest.cc',
         'desktop_background/desktop_background_controller_unittest.cc',
         'desktop_background/wallpaper_resizer_unittest.cc',
         'dip_unittest.cc',
         'display/display_controller_unittest.cc',
-        'display/display_error_observer_unittest.cc',
+        'display/display_change_observer_chromeos_unittest.cc',
+        'display/display_error_observer_chromeos_unittest.cc',
         'display/display_info_unittest.cc',
         'display/display_manager_unittest.cc',
         'display/mirror_window_controller_unittest.cc',
         'display/mouse_cursor_event_filter_unittest.cc',
         'display/resolution_notification_controller_unittest.cc',
         'display/root_window_transformers_unittest.cc',
         'display/screen_position_controller_unittest.cc',
         'drag_drop/drag_drop_controller_unittest.cc',
         'drag_drop/drag_drop_tracker_unittest.cc',
         'extended_desktop_unittest.cc',
@@ skipping 109 matching lines @@
             ['exclude', 'tooltips/tooltip_controller_unittest.cc'],
           ],
           'dependencies': [
             # Mac tests access resources via the 'AuraShell.app' directory.
             'ash_shell',
           ],
           # Special linker instructions that avoids stripping Obj-C classes that
           # are not referenced in code, but are referenced in nibs.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
-        ['use_x11==1', {
-          'sources': [
-            'display/display_util_x11_unittest.cc'
+        ['use_x11!=1', {

[oshima, 2013/08/19 20:00:24]

ditto

+          'sources/': [
+            ['exclude', 'display/display_change_observer_chromeos_unittest.cc'],
+            ['exclude', 'display/display_error_observer_chromeos_unittest.cc'],
           ],
         }],
-        ['chromeos!=1', {
-          'sources/': [
-            ['exclude', 'display/display_error_observer_unittest.cc'],
-          ],
-        }, {  # chromeos==1
+        ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:power_manager_proto',
           ],
         }],
         ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
           'link_settings': {
             'ldflags': ['-rdynamic'],
@@ skipping 92 matching lines @@
             'shell/cocoa/app-Info.plist',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist',
           },
         }],
       ],
     },
   ],
 }