Base infrastructure for Networking Private API on Windows and Mac.

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 10 matching lines @@
         'chrome_resources.gyp:platform_locale_settings',
         'chrome_resources.gyp:theme_resources',
         'common',
         'common/extensions/api/api.gyp:api',
         'common_net',
         'debugger',
         'in_memory_url_index_cache_proto',
         'installer_util',
         'sync_file_system_proto',
         '../components/components.gyp:onc_component',
+        '../components/components.gyp:wifi_component',
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth',
         '../extensions/extensions.gyp:extensions_browser',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
@@ skipping 338 matching lines @@
         'browser/extensions/api/module/module.cc',
         'browser/extensions/api/module/module.h',
         'browser/extensions/api/music_manager_private/device_id.cc',
         'browser/extensions/api/music_manager_private/device_id.h',
         'browser/extensions/api/music_manager_private/device_id_chromeos.cc',
         'browser/extensions/api/music_manager_private/device_id_linux.cc',
         'browser/extensions/api/music_manager_private/device_id_mac.cc',
         'browser/extensions/api/music_manager_private/device_id_win.cc',
         'browser/extensions/api/music_manager_private/music_manager_private_api.cc',
         'browser/extensions/api/music_manager_private/music_manager_private_api.h',
-        'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_api.h',
-        'browser/extensions/api/networking_private/networking_private_crypto.cc',
-        'browser/extensions/api/networking_private/networking_private_crypto.h',
-        'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
-        'browser/extensions/api/networking_private/networking_private_event_router.h',
-        'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
-        'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
         'browser/extensions/api/notifications/notifications_api.cc',
         'browser/extensions/api/notifications/notifications_api.h',
         'browser/extensions/api/omnibox/omnibox_api.cc',
         'browser/extensions/api/omnibox/omnibox_api.h',
         'browser/extensions/api/page_capture/page_capture_api.cc',
         'browser/extensions/api/page_capture/page_capture_api.h',
         'browser/extensions/api/permissions/permissions_api.cc',
         'browser/extensions/api/permissions/permissions_api.h',
         'browser/extensions/api/permissions/permissions_api_helpers.cc',
         'browser/extensions/api/permissions/permissions_api_helpers.h',
@@ skipping 502 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../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/feedback_private/feedback_service_nonchromeos.cc',
             'browser/extensions/api/image_writer_private/operation_linux.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/diagnostics/diagnostics_api.cc',
             'browser/extensions/api/diagnostics/diagnostics_api.h',
             'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc',
             '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/filter_handler.cc',
             'browser/extensions/api/log_private/filter_handler.h',
             'browser/extensions/api/log_private/log_parser.cc',
             'browser/extensions/api/log_private/log_parser.h',
             'browser/extensions/api/log_private/log_private_api.h',
             'browser/extensions/api/log_private/log_private_api_chromeos.cc',
             'browser/extensions/api/log_private/syslog_parser.cc',
             'browser/extensions/api/log_private/syslog_parser.h',
             'browser/chromeos/extensions/screenlock_private_api.cc',
             'browser/chromeos/extensions/screenlock_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_api_chromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
             'browser/extensions/api/terminal/terminal_extension_helper.cc',
             'browser/extensions/api/terminal/terminal_extension_helper.h',
             'browser/extensions/api/terminal/terminal_private_api.cc',
             'browser/extensions/api/terminal/terminal_private_api.h',
           ],
         }],
         ['use_ash==1', {
           'sources': [
             'browser/extensions/api/tabs/ash_panel_contents.cc',
             'browser/extensions/api/tabs/ash_panel_contents.h',
@@ skipping 22 matching lines @@
             ['include', '^browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc'],
             ['include', '^browser/extensions/api/declarative_webrequest/webrequest_constants.cc'],
             ['include', '^browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc'],
             ['include', '^browser/extensions/api/extension_action/extension_action_api.cc'],
             ['include', '^browser/extensions/api/extension_action/extension_page_actions_api_constants.cc'],
             ['include', '^browser/extensions/api/messaging/extension_message_port.cc'],
             ['include', '^browser/extensions/api/messaging/incognito_connectability.cc'],
             ['include', '^browser/extensions/api/messaging/message_property_provider.cc'],
             ['include', '^browser/extensions/api/messaging/message_service.cc'],
             ['include', '^browser/extensions/api/module/module.cc'],
+            ['include', '^browser/extensions/api/networking_private/.*\.cc'],
             ['include', '^browser/extensions/api/omnibox/omnibox_api.cc'],
             ['include', '^browser/extensions/api/preference/preference_api.cc'],
             ['include', '^browser/extensions/api/proxy/proxy_api.cc'],
             ['include', '^browser/extensions/api/proxy/proxy_api_constants.cc'],
             ['include', '^browser/extensions/api/runtime/runtime_api.cc'],
             ['include', '^browser/extensions/api/storage/.*\.cc'],
             ['include', '^browser/extensions/api/tabs/tabs_constants.cc'],
             ['include', '^browser/extensions/api/web_navigation/frame_navigation_state.cc'],
             ['include', '^browser/extensions/api/web_navigation/web_navigation_api.cc'],
             ['include', '^browser/extensions/api/web_navigation/web_navigation_api_constants.cc'],
@@ skipping 54 matching lines @@
         }, {  # configuration_policy==0
           'sources!': [
             'browser/extensions/api/storage/managed_value_store_cache.cc',
             'browser/extensions/api/storage/managed_value_store_cache.h',
             'browser/extensions/api/storage/policy_value_store.cc',
             'browser/extensions/api/storage/policy_value_store.h',
             'browser/extensions/policy_handlers.cc',
             'browser/extensions/policy_handlers.h',
           ],
         }],
         ['OS=="win"', {

[jam, 2013/11/21 19:01:30]

i don't think two OS=="win" sections is going to work? even if it does, there
should only be one.

Also, the convention for gypi files is that all files are listed in the main
section, and then files should be excluded per OS in the OS-specific conditions

[mef, 2013/11/21 21:15:50]

It appears that there could be multiple sections with same condition, but the CL
with mac implementation changes this section to be 'OS=="win" or OS=="mac"':
https://codereview.chromium.org/64683014/diff/50001/chrome/chrome_browser_ext...
Done.

+          'sources': [
+            'browser/extensions/api/networking_private/networking_private_api.h',
+            'browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_crypto.cc',
+            'browser/extensions/api/networking_private/networking_private_crypto.h',
+            'browser/extensions/api/networking_private/networking_private_event_router.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_event_router_factory.h',
+            'browser/extensions/api/networking_private/networking_private_event_router_nonchromeos.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client.h',
+            'browser/extensions/api/networking_private/networking_private_service_client_factory.cc',
+            'browser/extensions/api/networking_private/networking_private_service_client_factory.h',
+          ],
+        }],
+        ['OS=="win"', {
           'dependencies': [
             'launcher_support',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
           'sources!': [
             'browser/extensions/api/system_display/display_info_provider_aura.cc',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
@@ skipping 125 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/chromeos/contacts',
             'proto_out_dir': 'chrome/browser/chromeos/contacts',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],  # 'chromeos=1'
   ],  # 'conditions'
 }