Index: content/content_browser.gypi |
diff --git a/content/content_browser.gypi b/content/content_browser.gypi |
index 23a57fe87f4e9b2efd5c78e0027089a9728b5684..69a3dc00e165db1cd2f356640298f6ebb5f917dc 100644 |
--- a/content/content_browser.gypi |
+++ b/content/content_browser.gypi |
@@ -360,45 +360,6 @@ |
'browser/child_process_launcher.h', |
'browser/child_process_security_policy_impl.cc', |
'browser/child_process_security_policy_impl.h', |
- 'browser/compositor/browser_compositor_output_surface.cc', |
- 'browser/compositor/browser_compositor_output_surface.h', |
- 'browser/compositor/browser_compositor_output_surface_proxy.cc', |
- 'browser/compositor/browser_compositor_output_surface_proxy.h', |
- 'browser/compositor/browser_compositor_view_mac.mm', |
- 'browser/compositor/browser_compositor_view_mac.h', |
- 'browser/compositor/delegated_frame_host.cc', |
- 'browser/compositor/delegated_frame_host.h', |
- 'browser/compositor/gpu_process_transport_factory.cc', |
- 'browser/compositor/gpu_process_transport_factory.h', |
- 'browser/compositor/image_transport_factory.cc', |
- 'browser/compositor/image_transport_factory.h', |
- 'browser/compositor/no_transport_image_transport_factory.cc', |
- 'browser/compositor/no_transport_image_transport_factory.h', |
- 'browser/compositor/onscreen_display_client.cc', |
- 'browser/compositor/onscreen_display_client.h', |
- 'browser/compositor/overlay_candidate_validator_ozone.cc', |
- 'browser/compositor/overlay_candidate_validator_ozone.h', |
- 'browser/compositor/owned_mailbox.h', |
- 'browser/compositor/owned_mailbox.cc', |
- 'browser/compositor/reflector_impl.cc', |
- 'browser/compositor/reflector_impl.h', |
- 'browser/compositor/resize_lock.cc', |
- 'browser/compositor/resize_lock.h', |
- 'browser/compositor/gpu_browser_compositor_output_surface.cc', |
- 'browser/compositor/gpu_browser_compositor_output_surface.h', |
- 'browser/compositor/software_browser_compositor_output_surface.cc', |
- 'browser/compositor/software_browser_compositor_output_surface.h', |
- 'browser/compositor/software_output_device_mac.mm', |
- 'browser/compositor/software_output_device_mac.h', |
- 'browser/compositor/software_output_device_ozone.cc', |
- 'browser/compositor/software_output_device_ozone.h', |
- 'browser/compositor/software_output_device_win.cc', |
- 'browser/compositor/software_output_device_win.h', |
- 'browser/compositor/software_output_device_x11.cc', |
- 'browser/compositor/software_output_device_x11.h', |
- 'browser/compositor/surface_display_output_surface.cc', |
- 'browser/compositor/surface_display_output_surface.h', |
- 'browser/context_factory.cc', |
'browser/cross_site_request_manager.cc', |
'browser/cross_site_request_manager.h', |
'browser/devtools/devtools_agent_host_impl.cc', |
@@ -835,17 +796,6 @@ |
'browser/net/view_http_cache_job_factory.h', |
'browser/notification_service_impl.cc', |
'browser/notification_service_impl.h', |
- 'browser/pepper_flash_settings_helper_impl.cc', |
- 'browser/pepper_flash_settings_helper_impl.h', |
- 'browser/plugin_data_remover_impl.cc', |
- 'browser/plugin_data_remover_impl.h', |
- 'browser/plugin_loader_posix.cc', |
- 'browser/plugin_loader_posix.h', |
- 'browser/plugin_process_host.cc', |
- 'browser/plugin_process_host.h', |
- 'browser/plugin_process_host_mac.cc', |
- 'browser/plugin_service_impl.cc', |
- 'browser/plugin_service_impl.h', |
'browser/power_monitor_message_broadcaster.cc', |
'browser/power_monitor_message_broadcaster.h', |
'browser/power_profiler/power_data_provider.h', |
@@ -863,8 +813,6 @@ |
'browser/power_save_blocker_ozone.cc', |
'browser/power_save_blocker_win.cc', |
'browser/power_save_blocker_x11.cc', |
- 'browser/ppapi_plugin_process_host.cc', |
- 'browser/ppapi_plugin_process_host.h', |
'browser/profiler_controller_impl.cc', |
'browser/profiler_controller_impl.h', |
'browser/profiler_message_filter.cc', |
@@ -964,25 +912,6 @@ |
'browser/renderer_host/input/web_input_event_util.h', |
'browser/renderer_host/input/web_input_event_util_posix.cc', |
'browser/renderer_host/input/web_input_event_util_posix.h', |
- 'browser/renderer_host/java/gin_java_bound_object.h', |
- 'browser/renderer_host/java/gin_java_method_invocation_helper.cc', |
- 'browser/renderer_host/java/gin_java_method_invocation_helper.h', |
- 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc', |
- 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.h', |
- 'browser/renderer_host/java/java_bound_object.cc', |
- 'browser/renderer_host/java/java_bound_object.h', |
- 'browser/renderer_host/java/java_bridge_channel_host.cc', |
- 'browser/renderer_host/java/java_bridge_channel_host.h', |
- 'browser/renderer_host/java/java_bridge_dispatcher_host.cc', |
- 'browser/renderer_host/java/java_bridge_dispatcher_host.h', |
- 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc', |
- 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h', |
- 'browser/renderer_host/java/java_method.cc', |
- 'browser/renderer_host/java/java_method.h', |
- 'browser/renderer_host/java/java_type.cc', |
- 'browser/renderer_host/java/java_type.h', |
- 'browser/renderer_host/java/jni_helper.cc', |
- 'browser/renderer_host/java/jni_helper.h', |
'browser/renderer_host/legacy_render_widget_host_win.cc', |
'browser/renderer_host/legacy_render_widget_host_win.h', |
'browser/renderer_host/media/audio_input_device_manager.cc', |
@@ -1033,63 +962,6 @@ |
'browser/renderer_host/overscroll_controller.cc', |
'browser/renderer_host/overscroll_controller.h', |
'browser/renderer_host/overscroll_controller_delegate.h', |
- 'browser/renderer_host/pepper/browser_ppapi_host_impl.cc', |
- 'browser/renderer_host/pepper/browser_ppapi_host_impl.h', |
- 'browser/renderer_host/pepper/content_browser_pepper_host_factory.cc', |
- 'browser/renderer_host/pepper/content_browser_pepper_host_factory.h', |
- 'browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc', |
- 'browser/renderer_host/pepper/pepper_browser_font_singleton_host.h', |
- 'browser/renderer_host/pepper/pepper_external_file_ref_backend.cc', |
- 'browser/renderer_host/pepper/pepper_external_file_ref_backend.h', |
- 'browser/renderer_host/pepper/pepper_file_io_host.cc', |
- 'browser/renderer_host/pepper/pepper_file_io_host.h', |
- 'browser/renderer_host/pepper/pepper_file_ref_host.cc', |
- 'browser/renderer_host/pepper/pepper_file_ref_host.h', |
- 'browser/renderer_host/pepper/pepper_file_system_browser_host.cc', |
- 'browser/renderer_host/pepper/pepper_file_system_browser_host.h', |
- 'browser/renderer_host/pepper/pepper_flash_file_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_flash_file_message_filter.h', |
- 'browser/renderer_host/pepper/pepper_gamepad_host.cc', |
- 'browser/renderer_host/pepper/pepper_gamepad_host.h', |
- 'browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_host_resolver_message_filter.h', |
- 'browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc', |
- 'browser/renderer_host/pepper/pepper_internal_file_ref_backend.h', |
- 'browser/renderer_host/pepper/pepper_lookup_request.h', |
- 'browser/renderer_host/pepper/pepper_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_message_filter.h', |
- 'browser/renderer_host/pepper/pepper_network_monitor_host.cc', |
- 'browser/renderer_host/pepper/pepper_network_monitor_host.h', |
- 'browser/renderer_host/pepper/pepper_network_proxy_host.cc', |
- 'browser/renderer_host/pepper/pepper_network_proxy_host.h', |
- 'browser/renderer_host/pepper/pepper_print_settings_manager.cc', |
- 'browser/renderer_host/pepper/pepper_print_settings_manager.h', |
- 'browser/renderer_host/pepper/pepper_printing_host.cc', |
- 'browser/renderer_host/pepper/pepper_printing_host.h', |
- 'browser/renderer_host/pepper/pepper_renderer_connection.cc', |
- 'browser/renderer_host/pepper/pepper_renderer_connection.h', |
- 'browser/renderer_host/pepper/pepper_security_helper.cc', |
- 'browser/renderer_host/pepper/pepper_security_helper.h', |
- 'browser/renderer_host/pepper/pepper_socket_utils.cc', |
- 'browser/renderer_host/pepper/pepper_socket_utils.h', |
- 'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h', |
- 'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list.h', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_android.cc', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_host.cc', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_host.h', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_pango.cc', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm', |
- 'browser/renderer_host/pepper/pepper_truetype_font_list_win.cc', |
- 'browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc', |
- 'browser/renderer_host/pepper/pepper_udp_socket_message_filter.h', |
- 'browser/renderer_host/pepper/quota_reservation.cc', |
- 'browser/renderer_host/pepper/quota_reservation.h', |
- 'browser/renderer_host/pepper/ssl_context_helper.cc', |
- 'browser/renderer_host/pepper/ssl_context_helper.h', |
'browser/renderer_host/popup_menu_helper_mac.h', |
'browser/renderer_host/popup_menu_helper_mac.mm', |
'browser/renderer_host/render_message_filter.cc', |
@@ -1403,6 +1275,166 @@ |
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc', |
'<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h', |
], |
+ 'android_browser_sources': [ |
+ 'browser/renderer_host/java/gin_java_bound_object.h', |
+ 'browser/renderer_host/java/gin_java_method_invocation_helper.cc', |
+ 'browser/renderer_host/java/gin_java_method_invocation_helper.h', |
+ 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.cc', |
+ 'browser/renderer_host/java/gin_java_script_to_java_types_coercion.h', |
+ 'browser/renderer_host/java/java_bound_object.cc', |
+ 'browser/renderer_host/java/java_bound_object.h', |
+ 'browser/renderer_host/java/java_bridge_channel_host.cc', |
+ 'browser/renderer_host/java/java_bridge_channel_host.h', |
+ 'browser/renderer_host/java/java_bridge_dispatcher_host.cc', |
+ 'browser/renderer_host/java/java_bridge_dispatcher_host.h', |
+ 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc', |
+ 'browser/renderer_host/java/java_bridge_dispatcher_host_manager.h', |
+ 'browser/renderer_host/java/java_method.cc', |
+ 'browser/renderer_host/java/java_method.h', |
+ 'browser/renderer_host/java/java_type.cc', |
+ 'browser/renderer_host/java/java_type.h', |
+ 'browser/renderer_host/java/jni_helper.cc', |
+ 'browser/renderer_host/java/jni_helper.h', |
+ ], |
+ 'webrtc_browser_sources': [ |
+ 'browser/media/webrtc_internals.cc', |
+ 'browser/media/webrtc_internals.h', |
+ 'browser/media/webrtc_internals_message_handler.cc', |
+ 'browser/media/webrtc_internals_message_handler.h', |
+ 'browser/media/webrtc_internals_ui.cc', |
+ 'browser/media/webrtc_internals_ui.h', |
+ 'browser/media/webrtc_internals_ui_observer.h', |
+ 'browser/renderer_host/media/peer_connection_tracker_host.cc', |
+ 'browser/renderer_host/media/peer_connection_tracker_host.h', |
+ 'browser/renderer_host/media/webrtc_identity_service_host.cc', |
+ 'browser/renderer_host/media/webrtc_identity_service_host.h', |
+ 'browser/renderer_host/p2p/socket_host.cc', |
+ 'browser/renderer_host/p2p/socket_host.h', |
+ 'browser/renderer_host/p2p/socket_host_tcp.cc', |
+ 'browser/renderer_host/p2p/socket_host_tcp.h', |
+ 'browser/renderer_host/p2p/socket_host_tcp_server.cc', |
+ 'browser/renderer_host/p2p/socket_host_tcp_server.h', |
+ 'browser/renderer_host/p2p/socket_host_throttler.cc', |
+ 'browser/renderer_host/p2p/socket_host_throttler.h', |
+ 'browser/renderer_host/p2p/socket_host_udp.cc', |
+ 'browser/renderer_host/p2p/socket_host_udp.h', |
+ 'browser/renderer_host/p2p/socket_dispatcher_host.cc', |
+ 'browser/renderer_host/p2p/socket_dispatcher_host.h', |
+ ], |
+ 'compositor_browser_sources': [ |
+ 'browser/compositor/browser_compositor_output_surface.cc', |
+ 'browser/compositor/browser_compositor_output_surface.h', |
+ 'browser/compositor/browser_compositor_output_surface_proxy.cc', |
+ 'browser/compositor/browser_compositor_output_surface_proxy.h', |
+ 'browser/compositor/browser_compositor_view_mac.mm', |
+ 'browser/compositor/browser_compositor_view_mac.h', |
+ 'browser/compositor/delegated_frame_host.cc', |
+ 'browser/compositor/delegated_frame_host.h', |
+ 'browser/compositor/gpu_process_transport_factory.cc', |
+ 'browser/compositor/gpu_process_transport_factory.h', |
+ 'browser/compositor/image_transport_factory.cc', |
+ 'browser/compositor/image_transport_factory.h', |
+ 'browser/compositor/no_transport_image_transport_factory.cc', |
+ 'browser/compositor/no_transport_image_transport_factory.h', |
+ 'browser/compositor/onscreen_display_client.cc', |
+ 'browser/compositor/onscreen_display_client.h', |
+ 'browser/compositor/overlay_candidate_validator_ozone.cc', |
+ 'browser/compositor/overlay_candidate_validator_ozone.h', |
+ 'browser/compositor/owned_mailbox.h', |
+ 'browser/compositor/owned_mailbox.cc', |
+ 'browser/compositor/reflector_impl.cc', |
+ 'browser/compositor/reflector_impl.h', |
+ 'browser/compositor/resize_lock.cc', |
+ 'browser/compositor/resize_lock.h', |
+ 'browser/compositor/gpu_browser_compositor_output_surface.cc', |
+ 'browser/compositor/gpu_browser_compositor_output_surface.h', |
+ 'browser/compositor/software_browser_compositor_output_surface.cc', |
+ 'browser/compositor/software_browser_compositor_output_surface.h', |
+ 'browser/compositor/software_output_device_mac.mm', |
+ 'browser/compositor/software_output_device_mac.h', |
+ 'browser/compositor/software_output_device_ozone.cc', |
+ 'browser/compositor/software_output_device_ozone.h', |
+ 'browser/compositor/software_output_device_win.cc', |
+ 'browser/compositor/software_output_device_win.h', |
+ 'browser/compositor/software_output_device_x11.cc', |
+ 'browser/compositor/software_output_device_x11.h', |
+ 'browser/compositor/surface_display_output_surface.cc', |
+ 'browser/compositor/surface_display_output_surface.h', |
+ 'browser/context_factory.cc', |
+ ], |
+ 'plugin_browser_sources': [ |
+ 'browser/pepper_flash_settings_helper_impl.cc', |
+ 'browser/pepper_flash_settings_helper_impl.h', |
+ 'browser/plugin_data_remover_impl.cc', |
+ 'browser/plugin_data_remover_impl.h', |
+ 'browser/plugin_loader_posix.cc', |
+ 'browser/plugin_loader_posix.h', |
+ 'browser/plugin_process_host.cc', |
+ 'browser/plugin_process_host.h', |
+ 'browser/plugin_process_host_mac.cc', |
+ 'browser/plugin_service_impl.cc', |
+ 'browser/plugin_service_impl.h', |
+ 'browser/ppapi_plugin_process_host.cc', |
+ 'browser/ppapi_plugin_process_host.h', |
+ 'browser/renderer_host/pepper/browser_ppapi_host_impl.cc', |
+ 'browser/renderer_host/pepper/browser_ppapi_host_impl.h', |
+ 'browser/renderer_host/pepper/content_browser_pepper_host_factory.cc', |
+ 'browser/renderer_host/pepper/content_browser_pepper_host_factory.h', |
+ 'browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc', |
+ 'browser/renderer_host/pepper/pepper_browser_font_singleton_host.h', |
+ 'browser/renderer_host/pepper/pepper_external_file_ref_backend.cc', |
+ 'browser/renderer_host/pepper/pepper_external_file_ref_backend.h', |
+ 'browser/renderer_host/pepper/pepper_file_io_host.cc', |
+ 'browser/renderer_host/pepper/pepper_file_io_host.h', |
+ 'browser/renderer_host/pepper/pepper_file_ref_host.cc', |
+ 'browser/renderer_host/pepper/pepper_file_ref_host.h', |
+ 'browser/renderer_host/pepper/pepper_file_system_browser_host.cc', |
+ 'browser/renderer_host/pepper/pepper_file_system_browser_host.h', |
+ 'browser/renderer_host/pepper/pepper_flash_file_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_flash_file_message_filter.h', |
+ 'browser/renderer_host/pepper/pepper_gamepad_host.cc', |
+ 'browser/renderer_host/pepper/pepper_gamepad_host.h', |
+ 'browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_host_resolver_message_filter.h', |
+ 'browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc', |
+ 'browser/renderer_host/pepper/pepper_internal_file_ref_backend.h', |
+ 'browser/renderer_host/pepper/pepper_lookup_request.h', |
+ 'browser/renderer_host/pepper/pepper_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_message_filter.h', |
+ 'browser/renderer_host/pepper/pepper_network_monitor_host.cc', |
+ 'browser/renderer_host/pepper/pepper_network_monitor_host.h', |
+ 'browser/renderer_host/pepper/pepper_network_proxy_host.cc', |
+ 'browser/renderer_host/pepper/pepper_network_proxy_host.h', |
+ 'browser/renderer_host/pepper/pepper_printing_host.cc', |
+ 'browser/renderer_host/pepper/pepper_printing_host.h', |
+ 'browser/renderer_host/pepper/pepper_print_settings_manager.cc', |
+ 'browser/renderer_host/pepper/pepper_print_settings_manager.h', |
+ 'browser/renderer_host/pepper/pepper_renderer_connection.cc', |
+ 'browser/renderer_host/pepper/pepper_renderer_connection.h', |
+ 'browser/renderer_host/pepper/pepper_security_helper.cc', |
+ 'browser/renderer_host/pepper/pepper_security_helper.h', |
+ 'browser/renderer_host/pepper/pepper_socket_utils.cc', |
+ 'browser/renderer_host/pepper/pepper_socket_utils.h', |
+ 'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h', |
+ 'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_android.cc', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list.h', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_host.cc', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_host.h', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_mac.mm', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_pango.cc', |
+ 'browser/renderer_host/pepper/pepper_truetype_font_list_win.cc', |
+ 'browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc', |
+ 'browser/renderer_host/pepper/pepper_udp_socket_message_filter.h', |
+ 'browser/renderer_host/pepper/quota_reservation.cc', |
+ 'browser/renderer_host/pepper/quota_reservation.h', |
+ 'browser/renderer_host/pepper/ssl_context_helper.cc', |
+ 'browser/renderer_host/pepper/ssl_context_helper.h', |
+ 'public/browser/plugin_service.h', |
+ ], |
}, |
'sources': [ |
'<@(public_browser_sources)', |
@@ -1508,29 +1540,7 @@ |
'../jingle/jingle.gyp:jingle_glue', |
], |
'sources': [ |
- 'browser/media/webrtc_internals.cc', |
- 'browser/media/webrtc_internals.h', |
- 'browser/media/webrtc_internals_message_handler.cc', |
- 'browser/media/webrtc_internals_message_handler.h', |
- 'browser/media/webrtc_internals_ui.cc', |
- 'browser/media/webrtc_internals_ui.h', |
- 'browser/media/webrtc_internals_ui_observer.h', |
- 'browser/renderer_host/media/peer_connection_tracker_host.cc', |
- 'browser/renderer_host/media/peer_connection_tracker_host.h', |
- 'browser/renderer_host/media/webrtc_identity_service_host.cc', |
- 'browser/renderer_host/media/webrtc_identity_service_host.h', |
- 'browser/renderer_host/p2p/socket_host.cc', |
- 'browser/renderer_host/p2p/socket_host.h', |
- 'browser/renderer_host/p2p/socket_host_tcp.cc', |
- 'browser/renderer_host/p2p/socket_host_tcp.h', |
- 'browser/renderer_host/p2p/socket_host_tcp_server.cc', |
- 'browser/renderer_host/p2p/socket_host_tcp_server.h', |
- 'browser/renderer_host/p2p/socket_host_throttler.cc', |
- 'browser/renderer_host/p2p/socket_host_throttler.h', |
- 'browser/renderer_host/p2p/socket_host_udp.cc', |
- 'browser/renderer_host/p2p/socket_host_udp.h', |
- 'browser/renderer_host/p2p/socket_dispatcher_host.cc', |
- 'browser/renderer_host/p2p/socket_dispatcher_host.h', |
+ '<@(webrtc_browser_sources)', |
], |
}], |
['enable_webrtc==1 and OS=="linux"', { |
@@ -1635,17 +1645,20 @@ |
], |
}, |
'sources/': [ |
- ['exclude', '^browser/battery_status/battery_status_manager_default.cc$'], |
- ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'], |
+ ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc$'], |
+ ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'], |
['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'], |
['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'], |
- ['exclude', '^browser/tracing/tracing_ui'], |
+ ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'], |
['exclude', '^browser/speech/'], |
['include', '^browser/speech/speech_recognition_dispatcher_host\\.(cc|h)$'], |
['include', '^browser/speech/speech_recognition_manager_impl\\.(cc|h)$'], |
['include', '^browser/speech/speech_recognizer\\.h$'], |
['include', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)$'], |
], |
+ 'sources': [ |
+ '<@(android_browser_sources)', |
+ ], |
'sources!': [ |
'browser/browser_ipc_logging.cc', |
'browser/font_list_async.cc', |
@@ -1654,11 +1667,6 @@ |
'browser/geolocation/wifi_data_provider_common.cc', |
'browser/renderer_host/native_web_keyboard_event.cc', |
] |
- }, { # OS!="android" |
- 'sources/': [ |
- ['exclude', '^browser/renderer_host/java/'], |
- ['exclude', '^browser/speech/speech_recognizer_impl_android\\.(cc|h)'], |
- ], |
}], |
['OS=="mac"', { |
'sources/': [ |
@@ -1712,10 +1720,9 @@ |
'dependencies': [ |
'../ui/compositor/compositor.gyp:compositor', |
], |
+ 'sources': [ '<@(compositor_browser_sources)' ], |
}, { |
'sources/': [ |
- ['exclude', '^browser/compositor/'], |
- ['exclude', '^browser/context_factory.cc'], |
['exclude', '^public/browser/context_factory.h'], |
] |
}], |
@@ -1724,23 +1731,8 @@ |
'../ppapi/ppapi_internal.gyp:ppapi_ipc', |
'../ppapi/ppapi_internal.gyp:ppapi_shared', |
], |
- }, { # enable_plugins==0 |
- 'sources!': [ |
- 'browser/pepper_flash_settings_helper_impl.cc', |
- 'browser/pepper_flash_settings_helper_impl.h', |
- 'browser/plugin_data_remover_impl.cc', |
- 'browser/plugin_data_remover_impl.h', |
- 'browser/plugin_loader_posix.cc', |
- 'browser/plugin_loader_posix.h', |
- 'browser/plugin_process_host.cc', |
- 'browser/plugin_process_host.h', |
- 'browser/plugin_service_impl.cc', |
- 'browser/plugin_service_impl.h', |
- 'browser/ppapi_plugin_process_host.cc', |
- 'public/browser/plugin_service.h', |
- ], |
- 'sources/': [ |
- ['exclude', '^browser/renderer_host/pepper/'], |
+ 'sources': [ |
+ '<@(plugin_browser_sources)', |
], |
}], |
['input_speech==1', { |