ash: Get output info from chromeos instead of XRandR.

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 2fba6f3122a88064fdc25ca46c247c8f24dccc26..eca191af8fca8153bfb5dbcd211e06d990b55b63 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -83,12 +83,12 @@
         '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',
@@ -98,8 +98,6 @@
         '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',
@@ -555,6 +553,14 @@
             ['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',
@@ -564,8 +570,6 @@
         }, { # 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'],
           ],
@@ -674,7 +678,8 @@
         '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',
@@ -804,16 +809,13 @@
           # 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'
-          ],
-        }],
-        ['chromeos!=1', {
+        ['use_x11!=1', {

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

ditto

           'sources/': [
-            ['exclude', 'display/display_error_observer_unittest.cc'],
+            ['exclude', 'display/display_change_observer_chromeos_unittest.cc'],
+            ['exclude', 'display/display_error_observer_chromeos_unittest.cc'],
           ],
-        }, {  # chromeos==1
+        }],
+        ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:power_manager_proto',
           ],