Implement DisplayInfoProvider::UpdateDisplayUnitInfoForPlatform method for Linux GTK. (Resubmit aft…

chrome/chrome_browser_extensions.gypi

Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index f746ea952dc832218e0abb0e312416e815e6906d..46dd9e915c7c017843c788b6b96861bfa46315cb 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -485,10 +485,11 @@
         'browser/extensions/api/system_cpu/system_cpu_api.h',
         'browser/extensions/api/system_display/display_info_provider.cc',
         'browser/extensions/api/system_display/display_info_provider.h',
+        'browser/extensions/api/system_display/display_info_provider_aura.cc',
         'browser/extensions/api/system_display/display_info_provider_chromeos.cc',
+        'browser/extensions/api/system_display/display_info_provider_gtk.cc',
         'browser/extensions/api/system_display/display_info_provider_mac.cc',
         'browser/extensions/api/system_display/display_info_provider_win.cc',
-        'browser/extensions/api/system_display/display_info_provider_x11.cc',
         'browser/extensions/api/system_display/system_display_api.cc',
         'browser/extensions/api/system_display/system_display_api.h',
         'browser/extensions/api/system_indicator/system_indicator_api.h',
@@ -829,6 +830,7 @@
             'browser/extensions/api/feedback_private/feedback_service_nonchromeos.cc',
             'browser/extensions/api/log_private/log_private_api_nonchromeos.cc',
             'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
+            'browser/extensions/api/system_display/display_info_provider_aura.cc',
             'browser/extensions/default_apps.cc',
             'browser/extensions/default_apps.h',
           ],
@@ -966,6 +968,11 @@
                 '<(allocator_target)',
               ],
             }],
+            ['use_ash==1', {
+              'sources!': [
+                'browser/extensions/api/system_display/display_info_provider_aura.cc',
+              ],
+            }],

[Haojian Wu, 2013/09/06 00:20:35]

This is only change, exclude display_info_provider_aura.cc file in win_aura
building.

[oshima, 2013/09/06 17:29:24]

win aura does set use_ash=1 You need to exclude this for win for now.

[Haojian Wu, 2013/09/07 03:21:26]

Doesn't the statements here exclude the display_info_provider_aura.cc file?
It passed compiled with use_ash=1 on Windows on my local machine.

[oshima, 2013/09/07 03:25:12]

Sorry I should have said:

You should always exclude this for win. (no need to check use_ash)

[Haojian Wu, 2013/09/07 03:45:58]

Done.

           ],
         }, {  # 'OS!="win"
           'conditions': [