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

chrome/chrome_browser_extensions.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       'target_name': 'browser_extensions',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 467 matching lines @@
         'browser/extensions/api/sync_file_system/sync_file_system_api.cc',
         'browser/extensions/api/sync_file_system/sync_file_system_api.h',
         'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc',
         'browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h',
         'browser/extensions/api/system_cpu/cpu_info_provider.cc',
         'browser/extensions/api/system_cpu/cpu_info_provider.h',
         'browser/extensions/api/system_cpu/system_cpu_api.cc',
         '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',
         'browser/extensions/api/system_indicator/system_indicator_manager.cc',
         'browser/extensions/api/system_indicator/system_indicator_manager.h',
         'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
         'browser/extensions/api/system_indicator/system_indicator_manager_factory.h',
         'browser/extensions/api/system_info/system_info_api.cc',
         'browser/extensions/api/system_info/system_info_api.h',
         'browser/extensions/api/system_info/system_info_provider.cc',
@@ skipping 320 matching lines @@
             '../chromeos/ime/input_method.gyp:gencode',
             '../third_party/libevent/libevent.gyp:libevent',
             'contacts_proto',
           ],
           'sources!': [
             'browser/extensions/api/audio/audio_service.cc',
             'browser/extensions/api/diagnostics/diagnostics_api_nonchromeos.cc',
             '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',
           ],
           'sources': [
             'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc',
             'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h',
             'browser/extensions/api/input_ime/input_ime_api.cc',
             'browser/extensions/api/input_ime/input_ime_api.h',
             'browser/extensions/api/log_private/log_private_api_chromeos.cc',
             'browser/extensions/api/rtc_private/rtc_private_api.cc',
@@ skipping 117 matching lines @@
             'launcher_support',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(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': [
             ['OS=="linux" and toolkit_views==1',{
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
                 '<(INTERMEDIATE_DIR)/chrome',
               ],
               'sources/': [
                 # Other excluded stuff.
@@ skipping 62 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/chromeos/contacts',
             'proto_out_dir': 'chrome/browser/chromeos/contacts',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],  # 'chromeos=1'
   ],  # 'conditions'
 }