X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcontent%2Fcontent_browser.gypi;h=e97081d93264308c2c0ede307940b71c8883c9a6;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=6570d15dd51ac33a90cf9f43e63103ad71e3532f;hpb=4b53d56b8a1db20d4089f6d4f37126d43f907125;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/content/content_browser.gypi b/src/content/content_browser.gypi index 6570d15..e97081d 100644 --- a/src/content/content_browser.gypi +++ b/src/content/content_browser.gypi @@ -4,21 +4,23 @@ { 'dependencies': [ - 'browser/speech/proto/speech_proto.gyp:speech_proto', + '../third_party/re2/re2.gyp:re2', '../base/base.gyp:base_static', '../crypto/crypto.gyp:crypto', '../google_apis/google_apis.gyp:google_apis', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../sql/sql.gyp:sql', - '../third_party/re2/re2.gyp:re2', '../third_party/zlib/google/zip.gyp:zip', '../third_party/zlib/zlib.gyp:zlib', - '../ui/events/events.gyp:events', + '../ui/accessibility/accessibility.gyp:accessibility', + '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/resources/ui_resources.gyp:ui_resources', '../ui/snapshot/snapshot.gyp:snapshot', '../ui/ui.gyp:ui', - '../ui/ui.gyp:ui_resources', + 'browser/speech/proto/speech_proto.gyp:speech_proto', ], 'include_dirs': [ '..', @@ -30,7 +32,6 @@ 'port/browser/render_view_host_delegate_view.h', 'port/browser/render_widget_host_view_port.h', 'port/browser/vibration_provider.h', - 'port/browser/synthetic_gesture.h', 'port/browser/web_contents_view_port.h', 'public/browser/access_token_store.h', 'public/browser/android/compositor.h', @@ -72,6 +73,8 @@ 'public/browser/content_browser_client.cc', 'public/browser/content_browser_client.h', 'public/browser/cookie_store_factory.h', + 'public/browser/desktop_media_id.cc', + 'public/browser/desktop_media_id.h', 'public/browser/devtools_agent_host.h', 'public/browser/devtools_client_host.h', 'public/browser/devtools_external_agent_proxy.h', @@ -149,6 +152,7 @@ 'public/browser/render_frame_host.h', 'public/browser/render_process_host.h', 'public/browser/render_process_host_factory.h', + 'public/browser/render_process_host_observer.h', 'public/browser/render_view_host.h', 'public/browser/render_widget_host.h', 'public/browser/render_widget_host_view.h', @@ -166,6 +170,7 @@ 'public/browser/save_page_type.h', 'public/browser/session_storage_namespace.h', 'public/browser/session_storage_usage_info.h', + 'public/browser/signed_certificate_timestamp_store.h', 'public/browser/site_instance.h', 'public/browser/speech_recognition_event_listener.h', 'public/browser/speech_recognition_manager.h', @@ -176,8 +181,6 @@ 'public/browser/speech_recognition_session_context.h', 'public/browser/storage_partition.h', 'public/browser/stream_handle.h', - 'public/browser/trace_controller.h', - 'public/browser/trace_subscriber.h', 'public/browser/tracing_controller.h', 'public/browser/user_metrics.h', 'public/browser/utility_process_host.h', @@ -202,6 +205,8 @@ 'public/browser/worker_service.h', 'public/browser/worker_service_observer.h', 'public/browser/zygote_host_linux.h', + 'browser/accessibility/accessibility_mode_helper.cc', + 'browser/accessibility/accessibility_mode_helper.h', 'browser/accessibility/accessibility_tree_formatter.cc', 'browser/accessibility/accessibility_tree_formatter.h', 'browser/accessibility/accessibility_tree_formatter_android.cc', @@ -263,6 +268,9 @@ 'browser/android/devtools_auth.cc', 'browser/android/edge_effect.h', 'browser/android/edge_effect.cc', + 'browser/android/gesture_event_type_list.h', + 'browser/android/in_process/synchronous_compositor_factory_impl.cc', + 'browser/android/in_process/synchronous_compositor_factory_impl.h', 'browser/android/in_process/synchronous_compositor_impl.cc', 'browser/android/in_process/synchronous_compositor_impl.h', 'browser/android/in_process/synchronous_compositor_output_surface.cc', @@ -275,10 +283,9 @@ 'browser/android/load_url_params.h', 'browser/android/overscroll_glow.h', 'browser/android/overscroll_glow.cc', + 'browser/android/popup_item_type_list.h', 'browser/android/surface_texture_peer_browser_impl.cc', 'browser/android/surface_texture_peer_browser_impl.h', - 'browser/android/touch_point.cc', - 'browser/android/touch_point.h', 'browser/android/tracing_controller_android.cc', 'browser/android/tracing_controller_android.h', 'browser/android/web_contents_observer_android.cc', @@ -289,30 +296,6 @@ 'browser/appcache/appcache_frontend_proxy.h', 'browser/appcache/chrome_appcache_service.cc', 'browser/appcache/chrome_appcache_service.h', - 'browser/aura/browser_compositor_output_surface.cc', - 'browser/aura/browser_compositor_output_surface.h', - 'browser/aura/browser_compositor_output_surface_proxy.cc', - 'browser/aura/browser_compositor_output_surface_proxy.h', - 'browser/aura/compositor_resize_lock.cc', - 'browser/aura/compositor_resize_lock.h', - 'browser/aura/gpu_process_transport_factory.cc', - 'browser/aura/gpu_process_transport_factory.h', - 'browser/aura/image_transport_factory.cc', - 'browser/aura/image_transport_factory.h', - 'browser/aura/no_transport_image_transport_factory.cc', - 'browser/aura/no_transport_image_transport_factory.h', - 'browser/aura/reflector_impl.cc', - 'browser/aura/reflector_impl.h', - 'browser/aura/resize_lock.cc', - 'browser/aura/resize_lock.h', - 'browser/aura/software_browser_compositor_output_surface.cc', - 'browser/aura/software_browser_compositor_output_surface.h', - 'browser/aura/software_output_device_ozone.cc', - 'browser/aura/software_output_device_ozone.h', - 'browser/aura/software_output_device_win.cc', - 'browser/aura/software_output_device_win.h', - 'browser/aura/software_output_device_x11.cc', - 'browser/aura/software_output_device_x11.h', 'browser/browser_child_process_host_impl.cc', 'browser/browser_child_process_host_impl.h', 'browser/browser_context.cc', @@ -353,6 +336,32 @@ '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/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/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_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/cross_site_request_manager.cc', 'browser/cross_site_request_manager.h', 'browser/devtools/devtools_agent_host_impl.cc', @@ -371,8 +380,6 @@ 'browser/devtools/devtools_netlog_observer.h', 'browser/devtools/devtools_protocol.cc', 'browser/devtools/devtools_protocol.h', - 'browser/devtools/devtools_protocol_constants.cc', - 'browser/devtools/devtools_protocol_constants.h', 'browser/devtools/devtools_system_info_handler.cc', 'browser/devtools/devtools_system_info_handler.h', 'browser/devtools/devtools_tracing_handler.h', @@ -389,12 +396,10 @@ 'browser/devtools/worker_devtools_manager.h', 'browser/devtools/worker_devtools_message_filter.cc', 'browser/devtools/worker_devtools_message_filter.h', - 'browser/device_monitor_linux.cc', - 'browser/device_monitor_linux.h', 'browser/device_monitor_mac.h', 'browser/device_monitor_mac.mm', - 'browser/device_orientation/data_fetcher_impl_android.cc', - 'browser/device_orientation/data_fetcher_impl_android.h', + 'browser/device_monitor_udev.cc', + 'browser/device_monitor_udev.h', 'browser/device_orientation/data_fetcher_shared_memory.h', 'browser/device_orientation/data_fetcher_shared_memory_android.cc', 'browser/device_orientation/data_fetcher_shared_memory_base.cc', @@ -402,7 +407,6 @@ 'browser/device_orientation/data_fetcher_shared_memory_default.cc', 'browser/device_orientation/data_fetcher_shared_memory_mac.cc', 'browser/device_orientation/data_fetcher_shared_memory_win.cc', - 'browser/device_orientation/device_data.h', 'browser/device_orientation/device_inertial_sensor_service.cc', 'browser/device_orientation/device_inertial_sensor_service.h', 'browser/device_orientation/device_motion_message_filter.cc', @@ -410,6 +414,8 @@ 'browser/device_orientation/device_orientation_message_filter.cc', 'browser/device_orientation/device_orientation_message_filter.h', 'browser/device_orientation/inertial_sensor_consts.h', + 'browser/device_orientation/sensor_manager_android.cc', + 'browser/device_orientation/sensor_manager_android.h', 'browser/dom_storage/dom_storage_area.cc', 'browser/dom_storage/dom_storage_area.h', 'browser/dom_storage/dom_storage_context_impl.cc', @@ -506,19 +512,39 @@ 'browser/frame_host/frame_tree_node.h', 'browser/frame_host/interstitial_page_impl.cc', 'browser/frame_host/interstitial_page_impl.h', + 'browser/frame_host/interstitial_page_navigator_impl.cc', + 'browser/frame_host/interstitial_page_navigator_impl.h', + 'browser/frame_host/navigation_controller_android.cc', + 'browser/frame_host/navigation_controller_android.h', 'browser/frame_host/navigation_controller_delegate.h', 'browser/frame_host/navigation_controller_impl.cc', 'browser/frame_host/navigation_controller_impl.h', 'browser/frame_host/navigation_entry_impl.cc', 'browser/frame_host/navigation_entry_impl.h', + 'browser/frame_host/navigation_entry_screenshot_manager.cc', + 'browser/frame_host/navigation_entry_screenshot_manager.h', + 'browser/frame_host/navigator.cc', + 'browser/frame_host/navigator.h', + 'browser/frame_host/navigator_impl.cc', + 'browser/frame_host/navigator_impl.h', + 'browser/frame_host/navigator_delegate.cc', + 'browser/frame_host/navigator_delegate.h', + 'browser/frame_host/cross_process_frame_connector.cc', + 'browser/frame_host/cross_process_frame_connector.h', + 'browser/frame_host/render_frame_host_delegate.cc', + 'browser/frame_host/render_frame_host_delegate.h', + 'browser/frame_host/render_frame_host_factory.cc', + 'browser/frame_host/render_frame_host_factory.h', 'browser/frame_host/render_frame_host_impl.cc', 'browser/frame_host/render_frame_host_impl.h', + 'browser/frame_host/render_frame_host_manager.cc', + 'browser/frame_host/render_frame_host_manager.h', 'browser/frame_host/render_frame_message_filter.cc', 'browser/frame_host/render_frame_message_filter.h', - 'browser/frame_host/render_view_host_manager.cc', - 'browser/frame_host/render_view_host_manager.h', - 'browser/frame_host/web_contents_screenshot_manager.cc', - 'browser/frame_host/web_contents_screenshot_manager.h', + 'browser/frame_host/render_widget_host_view_child_frame.cc', + 'browser/frame_host/render_widget_host_view_child_frame.h', + 'browser/frame_host/render_widget_host_view_guest.cc', + 'browser/frame_host/render_widget_host_view_guest.h', 'browser/gamepad/gamepad_data_fetcher.h', 'browser/gamepad/gamepad_platform_data_fetcher.h', 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', @@ -535,6 +561,8 @@ 'browser/gamepad/gamepad_standard_mappings_linux.cc', 'browser/gamepad/gamepad_standard_mappings_mac.mm', 'browser/gamepad/gamepad_standard_mappings_win.cc', + 'browser/gamepad/raw_input_data_fetcher_win.cc', + 'browser/gamepad/raw_input_data_fetcher_win.h', 'browser/gamepad/xbox_data_fetcher_mac.cc', 'browser/gamepad/xbox_data_fetcher_mac.h', 'browser/geolocation/empty_wifi_data_provider.cc', @@ -654,6 +682,8 @@ 'browser/loader/certificate_resource_handler.h', 'browser/loader/cross_site_resource_handler.cc', 'browser/loader/cross_site_resource_handler.h', + 'browser/loader/detachable_resource_handler.cc', + 'browser/loader/detachable_resource_handler.h', 'browser/loader/global_routing_id.h', 'browser/loader/layered_resource_handler.cc', 'browser/loader/layered_resource_handler.h', @@ -700,6 +730,7 @@ 'browser/media/android/media_drm_credential_manager.h', 'browser/media/android/media_resource_getter_impl.cc', 'browser/media/android/media_resource_getter_impl.h', + 'browser/media/media_devices_monitor.cc', 'browser/media/media_internals.cc', 'browser/media/media_internals.h', 'browser/media/media_internals_handler.cc', @@ -719,17 +750,12 @@ 'browser/media/webrtc_internals_ui.cc', 'browser/media/webrtc_internals_ui.h', 'browser/media/webrtc_internals_ui_observer.h', - 'browser/media_devices_monitor.cc', 'browser/message_port_message_filter.cc', 'browser/message_port_message_filter.h', 'browser/message_port_service.cc', 'browser/message_port_service.h', 'browser/mime_registry_message_filter.cc', 'browser/mime_registry_message_filter.h', - 'browser/service_worker/service_worker_dispatcher_host.h', - 'browser/service_worker/service_worker_dispatcher_host.cc', - 'browser/service_worker/service_worker_context.h', - 'browser/service_worker/service_worker_context.cc', 'browser/net/browser_online_state_observer.cc', 'browser/net/browser_online_state_observer.h', 'browser/net/sqlite_persistent_cookie_store.cc', @@ -770,6 +796,7 @@ 'browser/profiler_message_filter.h', 'browser/quota_dispatcher_host.cc', 'browser/quota_dispatcher_host.h', + 'browser/renderer_data_memoizing_store.h', 'browser/renderer_host/backing_store.cc', 'browser/renderer_host/backing_store.h', 'browser/renderer_host/backing_store_aura.cc', @@ -780,10 +807,6 @@ 'browser/renderer_host/backing_store_mac.mm', 'browser/renderer_host/backing_store_manager.cc', 'browser/renderer_host/backing_store_manager.h', - 'browser/renderer_host/backing_store_win.cc', - 'browser/renderer_host/backing_store_win.h', - 'browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.cc', - 'browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.h', 'browser/renderer_host/clipboard_message_filter.cc', 'browser/renderer_host/clipboard_message_filter.h', 'browser/renderer_host/clipboard_message_filter_mac.mm', @@ -799,12 +822,18 @@ 'browser/renderer_host/compositing_iosurface_transformer_mac.h', 'browser/renderer_host/compositor_impl_android.cc', 'browser/renderer_host/compositor_impl_android.h', + 'browser/renderer_host/compositor_resize_lock_aura.cc', + 'browser/renderer_host/compositor_resize_lock_aura.h', + 'browser/renderer_host/cross_site_transferring_request.cc', + 'browser/renderer_host/cross_site_transferring_request.h', 'browser/renderer_host/database_message_filter.cc', 'browser/renderer_host/database_message_filter.h', 'browser/renderer_host/delegated_frame_evictor.cc', 'browser/renderer_host/delegated_frame_evictor.h', 'browser/renderer_host/dip_util.cc', 'browser/renderer_host/dip_util.h', + 'browser/renderer_host/display_link_mac.h', + 'browser/renderer_host/display_link_mac.cc', 'browser/renderer_host/file_utilities_message_filter.cc', 'browser/renderer_host/file_utilities_message_filter.h', 'browser/renderer_host/gamepad_browser_message_filter.cc', @@ -825,27 +854,45 @@ 'browser/renderer_host/image_transport_factory_android.h', 'browser/renderer_host/ime_adapter_android.cc', 'browser/renderer_host/ime_adapter_android.h', - 'browser/renderer_host/input/gesture_event_filter.cc', - 'browser/renderer_host/input/gesture_event_filter.h', - 'browser/renderer_host/input/immediate_input_router.cc', - 'browser/renderer_host/input/immediate_input_router.h', + 'browser/renderer_host/input/gesture_event_packet.cc', + 'browser/renderer_host/input/gesture_event_packet.h', + 'browser/renderer_host/input/gesture_event_queue.cc', + 'browser/renderer_host/input/gesture_event_queue.h', 'browser/renderer_host/input/input_ack_handler.h', 'browser/renderer_host/input/input_router.h', 'browser/renderer_host/input/input_router_client.h', - 'browser/renderer_host/input/synthetic_gesture_controller_new.cc', - 'browser/renderer_host/input/synthetic_gesture_controller_new.h', - 'browser/renderer_host/input/synthetic_gesture_new.cc', - 'browser/renderer_host/input/synthetic_gesture_new.h', + 'browser/renderer_host/input/input_router_impl.cc', + 'browser/renderer_host/input/input_router_impl.h', + 'browser/renderer_host/input/motion_event_android.cc', + 'browser/renderer_host/input/motion_event_android.h', + 'browser/renderer_host/input/synthetic_gesture.cc', + 'browser/renderer_host/input/synthetic_gesture.h', + 'browser/renderer_host/input/synthetic_gesture_controller.cc', + 'browser/renderer_host/input/synthetic_gesture_controller.h', 'browser/renderer_host/input/synthetic_gesture_target.h', - 'browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.cc', - 'browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.h', - 'browser/renderer_host/input/synthetic_web_input_event_builders.cc', - 'browser/renderer_host/input/synthetic_web_input_event_builders.h', + 'browser/renderer_host/input/synthetic_gesture_target_android.cc', + 'browser/renderer_host/input/synthetic_gesture_target_android.h', + 'browser/renderer_host/input/synthetic_gesture_target_aura.cc', + 'browser/renderer_host/input/synthetic_gesture_target_aura.h', + 'browser/renderer_host/input/synthetic_gesture_target_base.cc', + 'browser/renderer_host/input/synthetic_gesture_target_base.h', + 'browser/renderer_host/input/synthetic_pinch_gesture.cc', + 'browser/renderer_host/input/synthetic_pinch_gesture.h', + 'browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc', + 'browser/renderer_host/input/synthetic_smooth_scroll_gesture.h', + 'browser/renderer_host/input/synthetic_tap_gesture.cc', + 'browser/renderer_host/input/synthetic_tap_gesture.h', 'browser/renderer_host/input/tap_suppression_controller.cc', 'browser/renderer_host/input/tap_suppression_controller.h', 'browser/renderer_host/input/tap_suppression_controller_client.h', + 'browser/renderer_host/input/timeout_monitor.cc', + 'browser/renderer_host/input/timeout_monitor.h', 'browser/renderer_host/input/touch_event_queue.cc', 'browser/renderer_host/input/touch_event_queue.h', + 'browser/renderer_host/input/touch_action_filter.cc', + 'browser/renderer_host/input/touch_action_filter.h', + 'browser/renderer_host/input/touch_disposition_gesture_filter.cc', + 'browser/renderer_host/input/touch_disposition_gesture_filter.cc', 'browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc', 'browser/renderer_host/input/touchpad_tap_suppression_controller.cc', 'browser/renderer_host/input/touchpad_tap_suppression_controller.h', @@ -876,6 +923,8 @@ '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', 'browser/renderer_host/media/audio_input_device_manager.h', 'browser/renderer_host/media/audio_input_renderer_host.cc', @@ -888,6 +937,8 @@ 'browser/renderer_host/media/audio_renderer_host.h', 'browser/renderer_host/media/audio_sync_reader.cc', 'browser/renderer_host/media/audio_sync_reader.h', + 'browser/renderer_host/media/content_video_capture_device_core.cc', + 'browser/renderer_host/media/content_video_capture_device_core.h', 'browser/renderer_host/media/device_request_message_filter.cc', 'browser/renderer_host/media/device_request_message_filter.h', 'browser/renderer_host/media/media_stream_dispatcher_host.cc', @@ -929,7 +980,6 @@ 'browser/renderer_host/native_web_keyboard_event_aura.cc', 'browser/renderer_host/native_web_keyboard_event_gtk.cc', 'browser/renderer_host/native_web_keyboard_event_mac.mm', - 'browser/renderer_host/native_web_keyboard_event_win.cc', 'browser/renderer_host/overscroll_configuration.cc', 'browser/renderer_host/overscroll_controller.cc', 'browser/renderer_host/overscroll_controller.h', @@ -942,6 +992,8 @@ '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', @@ -979,11 +1031,14 @@ '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_linux.cc', + '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', @@ -1014,24 +1069,16 @@ 'browser/renderer_host/render_widget_host_view_base.h', 'browser/renderer_host/render_widget_host_view_gtk.cc', 'browser/renderer_host/render_widget_host_view_gtk.h', - 'browser/renderer_host/render_widget_host_view_guest.cc', - 'browser/renderer_host/render_widget_host_view_guest.h', 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h', 'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.mm', 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h', 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm', 'browser/renderer_host/render_widget_host_view_mac.h', 'browser/renderer_host/render_widget_host_view_mac.mm', - 'browser/renderer_host/render_widget_host_view_win.cc', - 'browser/renderer_host/render_widget_host_view_win.h', 'browser/renderer_host/renderer_frame_manager.cc', 'browser/renderer_host/renderer_frame_manager.h', 'browser/renderer_host/software_frame_manager.cc', 'browser/renderer_host/software_frame_manager.h', - 'browser/renderer_host/synthetic_gesture_calculator.cc', - 'browser/renderer_host/synthetic_gesture_calculator.h', - 'browser/renderer_host/synthetic_gesture_controller.cc', - 'browser/renderer_host/synthetic_gesture_controller.h', 'browser/renderer_host/socket_stream_dispatcher_host.cc', 'browser/renderer_host/socket_stream_dispatcher_host.h', 'browser/renderer_host/socket_stream_host.cc', @@ -1040,10 +1087,6 @@ 'browser/renderer_host/text_input_client_mac.mm', 'browser/renderer_host/text_input_client_message_filter.h', 'browser/renderer_host/text_input_client_message_filter.mm', - 'browser/renderer_host/generic_touch_gesture_android.cc', - 'browser/renderer_host/generic_touch_gesture_android.h', - 'browser/renderer_host/touch_smooth_scroll_gesture_aura.cc', - 'browser/renderer_host/touch_smooth_scroll_gesture_aura.h', 'browser/renderer_host/ui_events_helper.cc', 'browser/renderer_host/ui_events_helper.h', 'browser/renderer_host/web_input_event_aura.cc', @@ -1062,6 +1105,37 @@ 'browser/resource_context_impl.h', 'browser/safe_util_win.cc', 'browser/safe_util_win.h', + 'browser/service_worker/embedded_worker_instance.cc', + 'browser/service_worker/embedded_worker_instance.h', + 'browser/service_worker/embedded_worker_registry.cc', + 'browser/service_worker/embedded_worker_registry.h', + 'browser/service_worker/service_worker_context.h', + 'browser/service_worker/service_worker_context_core.cc', + 'browser/service_worker/service_worker_context_core.h', + 'browser/service_worker/service_worker_context_wrapper.cc', + 'browser/service_worker/service_worker_context_wrapper.h', + 'browser/service_worker/service_worker_dispatcher_host.cc', + 'browser/service_worker/service_worker_dispatcher_host.h', + 'browser/service_worker/service_worker_job_coordinator.cc', + 'browser/service_worker/service_worker_job_coordinator.h', + 'browser/service_worker/service_worker_provider_host.cc', + 'browser/service_worker/service_worker_provider_host.h', + 'browser/service_worker/service_worker_register_job.cc', + 'browser/service_worker/service_worker_register_job.h', + 'browser/service_worker/service_worker_registration.cc', + 'browser/service_worker/service_worker_registration.h', + 'browser/service_worker/service_worker_registration_status.cc', + 'browser/service_worker/service_worker_registration_status.h', + 'browser/service_worker/service_worker_storage.cc', + 'browser/service_worker/service_worker_storage.h', + 'browser/service_worker/service_worker_version.cc', + 'browser/service_worker/service_worker_version.h', + 'browser/shared_worker/shared_worker_message_filter.cc', + 'browser/shared_worker/shared_worker_message_filter.h', + 'browser/shared_worker/shared_worker_service_impl.cc', + 'browser/shared_worker/shared_worker_service_impl.h', + 'browser/signed_certificate_timestamp_store_impl.cc', + 'browser/signed_certificate_timestamp_store_impl.h', 'browser/site_instance_impl.cc', 'browser/site_instance_impl.h', 'browser/speech/audio_buffer.cc', @@ -1131,12 +1205,10 @@ 'browser/system_message_window_win.h', 'browser/tcmalloc_internals_request_job.cc', 'browser/tcmalloc_internals_request_job.h', - 'browser/tracing/trace_controller_impl.cc', - 'browser/tracing/trace_controller_impl.h', + 'browser/theme_helper_mac.mm', + 'browser/theme_helper_mac.h', 'browser/tracing/trace_message_filter.cc', 'browser/tracing/trace_message_filter.h', - 'browser/tracing/trace_subscriber_stdio.cc', - 'browser/tracing/trace_subscriber_stdio.h', 'browser/tracing/tracing_controller_impl.cc', 'browser/tracing/tracing_controller_impl.h', 'browser/tracing/tracing_ui.cc', @@ -1152,6 +1224,8 @@ 'browser/vibration/vibration_provider_android.h', 'browser/web_contents/aura/image_window_delegate.cc', 'browser/web_contents/aura/image_window_delegate.h', + 'browser/web_contents/aura/overscroll_navigation_overlay.cc', + 'browser/web_contents/aura/overscroll_navigation_overlay.h', 'browser/web_contents/aura/shadow_layer_delegate.cc', 'browser/web_contents/aura/shadow_layer_delegate.h', 'browser/web_contents/aura/window_slider.cc', @@ -1160,8 +1234,8 @@ 'browser/web_contents/drag_utils_gtk.h', 'browser/web_contents/touch_editable_impl_aura.cc', 'browser/web_contents/touch_editable_impl_aura.h', - 'browser/web_contents/web_contents_drag_win.cc', - 'browser/web_contents/web_contents_drag_win.h', + 'browser/web_contents/web_contents_android.cc', + 'browser/web_contents/web_contents_android.h', 'browser/web_contents/web_contents_impl.cc', 'browser/web_contents/web_contents_impl.h', 'browser/web_contents/web_contents_view_android.cc', @@ -1174,20 +1248,14 @@ 'browser/web_contents/web_contents_view_guest.h', 'browser/web_contents/web_contents_view_mac.h', 'browser/web_contents/web_contents_view_mac.mm', - 'browser/web_contents/web_contents_view_win.cc', - 'browser/web_contents/web_contents_view_win.h', 'browser/web_contents/web_drag_dest_gtk.cc', 'browser/web_contents/web_drag_dest_gtk.h', 'browser/web_contents/web_drag_dest_mac.h', 'browser/web_contents/web_drag_dest_mac.mm', - 'browser/web_contents/web_drag_dest_win.cc', - 'browser/web_contents/web_drag_dest_win.h', 'browser/web_contents/web_drag_source_gtk.cc', 'browser/web_contents/web_drag_source_gtk.h', 'browser/web_contents/web_drag_source_mac.h', 'browser/web_contents/web_drag_source_mac.mm', - 'browser/web_contents/web_drag_source_win.cc', - 'browser/web_contents/web_drag_source_win.h', 'browser/web_contents/web_drag_utils_win.cc', 'browser/web_contents/web_drag_utils_win.h', 'browser/webui/content_web_ui_controller_factory.cc', @@ -1230,9 +1298,17 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/devtools_resources_map.h', '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/grit/webui_resources_map.cc', + # These files are generated by devtools_protocol_constants_generator.py. + '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.cc', + '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/devtools_protocol_constants.h', ], 'conditions': [ - ['OS!="win" and OS!="mac" and OS!="linux"', { + ['toolkit_views==1', { + 'dependencies': [ + '../ui/events/events.gyp:events', + ], + }], + ['OS!="win" and OS!="mac" and (OS!="linux" or use_udev==0)', { 'sources': [ 'browser/gamepad/gamepad_platform_data_fetcher.cc', ] @@ -1259,6 +1335,7 @@ ['include', '^browser/cert_store_impl\\.cc$'], ['include', '^browser/download/download_create_info\\.cc$'], ['include', '^browser/notification_service_impl\\.cc$'], + ['include', '^browser/signed_certificate_timestamp_store_impl\\.cc$'], ['include', '^browser/user_metrics\\.cc$'], ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'], ], @@ -1267,7 +1344,6 @@ 'browser/devtools/devtools_resources.gyp:devtools_resources', '../cc/cc.gyp:cc', '../net/net.gyp:http_server', - '../printing/printing.gyp:printing', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', '../ui/surface/surface.gyp:surface', '../webkit/common/webkit_common.gyp:webkit_common', @@ -1275,6 +1351,12 @@ '../webkit/storage_common.gyp:webkit_storage_common', '../webkit/webkit_resources.gyp:webkit_resources', '../webkit/webkit_resources.gyp:webkit_strings', + '../third_party/angle/src/build_angle.gyp:commit_id', + ], + }], + ['enable_printing!=0', { + 'dependencies': [ + '../printing/printing.gyp:printing', ], }], ['OS!="ios" and chrome_multiple_dll!=1', { @@ -1327,6 +1409,8 @@ 'sources': [ 'browser/renderer_host/media/desktop_capture_device.cc', 'browser/renderer_host/media/desktop_capture_device.h', + 'browser/renderer_host/media/desktop_capture_device_aura.cc', + 'browser/renderer_host/media/desktop_capture_device_aura.h', ], 'dependencies': [ '../third_party/webrtc/modules/modules.gyp:desktop_capture', @@ -1372,26 +1456,34 @@ }], ['toolkit_uses_gtk == 1', { 'dependencies': [ - '../build/linux/system.gyp:dbus', # For FcLangSetAdd call in render_sandbox_host_linux.cc '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:gtk', # For XShm* in backing_store_x.cc '../build/linux/system.gyp:x11', - '../dbus/dbus.gyp:dbus', ], }], ['OS=="linux"', { 'dependencies': [ - '../build/linux/system.gyp:udev', '../sandbox/sandbox.gyp:libc_urandom_override', ], }], + ['use_udev == 1', { + 'dependencies': [ + '../build/linux/system.gyp:udev', + ], + }, { + 'sources!': [ + 'browser/device_monitor_udev.cc', + 'browser/device_monitor_udev.h', + 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc', + 'browser/udev_linux.cc', + 'browser/udev_linux.h', + ], + }], ['OS=="linux" and use_aura==1', { 'dependencies': [ - '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:fontconfig', - '../dbus/dbus.gyp:dbus', ], }], ['use_x11==1', { @@ -1403,6 +1495,9 @@ 'dependencies': [ '../build/linux/system.gyp:pangocairo', ], + 'sources!': [ + 'browser/renderer_host/pepper/pepper_truetype_font_list_ozone.cc', + ], }], ['OS=="android"', { 'dependencies': [ @@ -1431,7 +1526,6 @@ 'browser/geolocation/device_data_provider.cc', 'browser/geolocation/empty_device_data_provider.cc', 'browser/geolocation/wifi_data_provider_common.cc', - 'browser/renderer_host/input/tap_suppression_controller.cc', 'browser/renderer_host/native_web_keyboard_event.cc', ] }, { # OS!="android" @@ -1441,21 +1535,14 @@ ], }], ['OS=="mac"', { - 'sources': [ - # Build necessary Mozilla sources - '../third_party/mozilla/ComplexTextInputPanel.h', - '../third_party/mozilla/ComplexTextInputPanel.mm', - '../third_party/mozilla/NSPasteboard+Utils.h', - '../third_party/mozilla/NSPasteboard+Utils.mm', - '../third_party/mozilla/NSString+Utils.h', - '../third_party/mozilla/NSString+Utils.mm', - '../third_party/mozilla/NSURL+Utils.h', - '../third_party/mozilla/NSURL+Utils.m', - ], 'sources/': [ ['exclude', '^browser/device_orientation/data_fetcher_shared_memory_default.cc$'], ], + 'sources!': [ + 'browser/geolocation/empty_wifi_data_provider.cc', + ], 'dependencies': [ + '../third_party/mozilla/mozilla.gyp:mozilla', '../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor', ], 'link_settings': { @@ -1479,14 +1566,11 @@ ['os_bsd==1', { 'sources/': [ ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'], - ['exclude', '^browser/geolocation/wifi_data_provider_linux\\.cc$'], ], }], - ['use_aura!=1 and OS!="win"', { + ['use_aura!=1 and OS!="android"', { 'sources!': [ 'browser/renderer_host/input/touchscreen_tap_suppression_controller.cc', - 'browser/renderer_host/ui_events_helper.cc', - 'browser/renderer_host/ui_events_helper.h', 'browser/renderer_host/tap_suppression_controller.cc', ], }, { @@ -1498,35 +1582,32 @@ 'dependencies': [ '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', - '../ui/compositor/compositor.gyp:compositor', ], 'sources/': [ ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller.cc'], - ['exclude', '^browser/renderer_host/native_web_keyboard_event_win.cc'], - ['exclude', '^browser/renderer_host/render_widget_host.h'], - ['exclude', '^browser/renderer_host/render_widget_host_view_win.cc'], - ['exclude', '^browser/renderer_host/render_widget_host_view_win.h'], - ['exclude', '^browser/web_contents/web_contents_drag_win.cc'], - ['exclude', '^browser/web_contents/web_contents_drag_win.h'], - ['exclude', '^browser/web_contents/web_contents_view_win.cc'], - ['exclude', '^browser/web_contents/web_contents_view_win.h'], - ['exclude', '^browser/web_contents/web_drag_dest_win.cc'], - ['exclude', '^browser/web_contents/web_drag_dest_win.h'], - ['exclude', '^browser/web_contents/web_drag_source_win.cc'], - ['exclude', '^browser/web_contents/web_drag_source_win.h'], ], }, { 'sources/': [ - ['exclude', '^browser/aura/'], ['exclude', '^browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc'], ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'], ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'], ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'], ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'], + ['exclude', '^browser/renderer_host/ui_events_helper.cc'], + ['exclude', '^browser/renderer_host/ui_events_helper.h'], ], }], + ['use_aura==1 or OS=="mac"', { + 'dependencies': [ + '../ui/compositor/compositor.gyp:compositor', + ], + }, { + 'sources/': [ + ['exclude', '^browser/compositor/'], + ] + }], ['enable_plugins==1', { 'dependencies': [ '../ppapi/ppapi_internal.gyp:ppapi_ipc', @@ -1561,5 +1642,23 @@ '../third_party/speex/speex.gyp:libspeex', ], }], + ['OS == "win"', { + 'sources!': [ + 'browser/geolocation/empty_wifi_data_provider.cc', + ], + }], + ['OS == "linux" and use_dbus==1', { + 'sources!': [ + 'browser/geolocation/empty_wifi_data_provider.cc', + ], + 'dependencies': [ + '../build/linux/system.gyp:dbus', + '../dbus/dbus.gyp:dbus', + ], + }, { # OS != "linux" or use_dbus==0 + 'sources!': [ + 'browser/geolocation/wifi_data_provider_linux.cc', + ], + }], ], }