| Index: chrome/browser/BUILD.gn
|
| diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
| index c1f3f23b714fd651643af6128832e90dcc862e3d..a911c68fd282daf71492f3c4790d27550728c0cf 100644
|
| --- a/chrome/browser/BUILD.gn
|
| +++ b/chrome/browser/BUILD.gn
|
| @@ -487,44 +487,40 @@ split_static_library("browser") {
|
| "manifest/manifest_icon_selector.h",
|
| "media/combined_desktop_media_list.cc",
|
| "media/combined_desktop_media_list.h",
|
| - "media/desktop_media_list.h",
|
| - "media/desktop_media_list_base.cc",
|
| - "media/desktop_media_list_base.h",
|
| - "media/desktop_media_picker.h",
|
| - "media/desktop_streams_registry.cc",
|
| - "media/desktop_streams_registry.h",
|
| "media/media_access_handler.h",
|
| - "media/media_capture_devices_dispatcher.cc",
|
| - "media/media_capture_devices_dispatcher.h",
|
| "media/media_device_id_salt.cc",
|
| "media/media_device_id_salt.h",
|
| - "media/media_permission.cc",
|
| - "media/media_permission.h",
|
| - "media/media_stream_capture_indicator.cc",
|
| - "media/media_stream_capture_indicator.h",
|
| - "media/media_stream_device_permission_context.cc",
|
| - "media/media_stream_device_permission_context.h",
|
| - "media/media_stream_device_permissions.cc",
|
| - "media/media_stream_device_permissions.h",
|
| - "media/media_stream_devices_controller.cc",
|
| - "media/media_stream_devices_controller.h",
|
| "media/media_url_constants.cc",
|
| "media/media_url_constants.h",
|
| "media/midi_permission_context.cc",
|
| "media/midi_permission_context.h",
|
| - "media/native_desktop_media_list.cc",
|
| - "media/native_desktop_media_list.h",
|
| "media/output_protection_proxy.cc",
|
| "media/output_protection_proxy.h",
|
| - "media/permission_bubble_media_access_handler.cc",
|
| - "media/permission_bubble_media_access_handler.h",
|
| "media/router/media_router_feature.cc",
|
| "media/router/media_router_feature.h",
|
| -
|
| - # TODO(brettw) should this go with the webrtc sources?
|
| - "media/webrtc_log_list.cc",
|
| - "media/webrtc_log_list.h",
|
| - "media/window_icon_util.h",
|
| + "media/webrtc/desktop_media_list.h",
|
| + "media/webrtc/desktop_media_list_base.cc",
|
| + "media/webrtc/desktop_media_list_base.h",
|
| + "media/webrtc/desktop_media_picker.h",
|
| + "media/webrtc/desktop_streams_registry.cc",
|
| + "media/webrtc/desktop_streams_registry.h",
|
| + "media/webrtc/media_capture_devices_dispatcher.cc",
|
| + "media/webrtc/media_capture_devices_dispatcher.h",
|
| + "media/webrtc/media_permission.cc",
|
| + "media/webrtc/media_permission.h",
|
| + "media/webrtc/media_stream_capture_indicator.cc",
|
| + "media/webrtc/media_stream_capture_indicator.h",
|
| + "media/webrtc/media_stream_device_permission_context.cc",
|
| + "media/webrtc/media_stream_device_permission_context.h",
|
| + "media/webrtc/media_stream_device_permissions.cc",
|
| + "media/webrtc/media_stream_device_permissions.h",
|
| + "media/webrtc/media_stream_devices_controller.cc",
|
| + "media/webrtc/media_stream_devices_controller.h",
|
| + "media/webrtc/native_desktop_media_list.cc",
|
| + "media/webrtc/native_desktop_media_list.h",
|
| + "media/webrtc/permission_bubble_media_access_handler.cc",
|
| + "media/webrtc/permission_bubble_media_access_handler.h",
|
| + "media/webrtc/window_icon_util.h",
|
| "memory_details.cc",
|
| "memory_details.h",
|
| "memory_details_android.cc",
|
| @@ -1178,6 +1174,10 @@ split_static_library("browser") {
|
| "usb/web_usb_permission_provider.h",
|
| "web_data_service_factory.cc",
|
| "web_data_service_factory.h",
|
| +
|
| + # TODO(brettw) should this go with the webrtc sources?
|
| + "media/webrtc/webrtc_log_list.cc",
|
| + "media/webrtc/webrtc_log_list.h",
|
| "win/app_icon.cc",
|
| "win/app_icon.h",
|
| "win/browser_util.cc",
|
| @@ -1511,7 +1511,7 @@ split_static_library("browser") {
|
| }
|
| if (is_mac) {
|
| sources += [
|
| - "media/window_icon_util_mac.mm",
|
| + "media/webrtc/window_icon_util_mac.mm",
|
| "password_manager/password_manager_util_mac.h",
|
| "password_manager/password_manager_util_mac.mm",
|
| ]
|
| @@ -1552,12 +1552,12 @@ split_static_library("browser") {
|
| "media/capture_access_handler_base.h",
|
| "media/cast_transport_host_filter.cc",
|
| "media/cast_transport_host_filter.h",
|
| - "media/desktop_capture_access_handler.cc",
|
| - "media/desktop_capture_access_handler.h",
|
| "media/extension_media_access_handler.cc",
|
| "media/extension_media_access_handler.h",
|
| - "media/tab_capture_access_handler.cc",
|
| - "media/tab_capture_access_handler.h",
|
| + "media/webrtc/desktop_capture_access_handler.cc",
|
| + "media/webrtc/desktop_capture_access_handler.h",
|
| + "media/webrtc/tab_capture_access_handler.cc",
|
| + "media/webrtc/tab_capture_access_handler.h",
|
| "metrics/extensions_metrics_provider.cc",
|
| "metrics/extensions_metrics_provider.h",
|
| "renderer_context_menu/context_menu_content_type_app_mode.cc",
|
| @@ -2119,7 +2119,7 @@ split_static_library("browser") {
|
| "download/notification/download_notification_manager.h",
|
| "media/protected_media_identifier_permission_context.cc",
|
| "media/protected_media_identifier_permission_context.h",
|
| - "media/window_icon_util_chromeos.cc",
|
| + "media/webrtc/window_icon_util_chromeos.cc",
|
| "metrics/chromeos_metrics_provider.cc",
|
| "metrics/chromeos_metrics_provider.h",
|
| "metrics/perf/cpu_identity.cc",
|
| @@ -2221,8 +2221,8 @@ split_static_library("browser") {
|
| if (use_ash) {
|
| # Cross-platform Ash sources.
|
| sources += [
|
| - "media/desktop_media_list_ash.cc",
|
| - "media/desktop_media_list_ash.h",
|
| + "media/webrtc/desktop_media_list_ash.cc",
|
| + "media/webrtc/desktop_media_list_ash.h",
|
| "renderer_context_menu/open_with_menu_factory_ash.cc",
|
| "renderer_context_menu/open_with_menu_factory_ash.h",
|
| "signin/signin_error_notifier_ash.cc",
|
| @@ -2659,8 +2659,8 @@ split_static_library("browser") {
|
| "lifetime/keep_alive_types.h",
|
| "lifetime/scoped_keep_alive.cc",
|
| "lifetime/scoped_keep_alive.h",
|
| - "media/tab_desktop_media_list.cc",
|
| - "media/tab_desktop_media_list.h",
|
| + "media/webrtc/tab_desktop_media_list.cc",
|
| + "media/webrtc/tab_desktop_media_list.h",
|
| "media_galleries/fileapi/av_scanning_file_validator.cc",
|
| "media_galleries/fileapi/av_scanning_file_validator.h",
|
| "media_galleries/fileapi/device_media_async_file_util.cc",
|
| @@ -3254,12 +3254,12 @@ split_static_library("browser") {
|
| "media/android/router/media_router_android.h",
|
| "media/android/router/media_router_dialog_controller_android.cc",
|
| "media/android/router/media_router_dialog_controller_android.h",
|
| - "media/media_stream_infobar_delegate_android.cc",
|
| - "media/media_stream_infobar_delegate_android.h",
|
| "media/midi_permission_infobar_delegate_android.cc",
|
| "media/midi_permission_infobar_delegate_android.h",
|
| "media/protected_media_identifier_infobar_delegate_android.cc",
|
| "media/protected_media_identifier_infobar_delegate_android.h",
|
| + "media/webrtc/media_stream_infobar_delegate_android.cc",
|
| + "media/webrtc/media_stream_infobar_delegate_android.h",
|
| "metrics/android_metrics_provider.cc",
|
| "metrics/android_metrics_provider.h",
|
| "metrics/page_load_metrics_provider.cc",
|
| @@ -3376,7 +3376,7 @@ split_static_library("browser") {
|
| "google/did_run_updater_win.h",
|
| "hang_monitor/hang_crash_dump_win.cc",
|
| "hang_monitor/hang_crash_dump_win.h",
|
| - "media/window_icon_util_win.cc",
|
| + "media/webrtc/window_icon_util_win.cc",
|
| "metrics/antivirus_metrics_provider_win.cc",
|
| "metrics/antivirus_metrics_provider_win.h",
|
| "password_manager/password_manager_util_win.cc",
|
| @@ -3458,7 +3458,7 @@ split_static_library("browser") {
|
| "first_run/upgrade_util_linux.h",
|
| "fullscreen_aurax11.cc",
|
| "icon_loader_auralinux.cc",
|
| - "media/window_icon_util_x11.cc",
|
| + "media/webrtc/window_icon_util_x11.cc",
|
| "password_manager/native_backend_kwallet_x.cc",
|
| "password_manager/native_backend_kwallet_x.h",
|
| "platform_util_linux.cc",
|
| @@ -3581,21 +3581,22 @@ split_static_library("browser") {
|
| }
|
| if (enable_webrtc) {
|
| sources += [
|
| - # TODO(brettw) should webrtc_log_list.cc go here?
|
| - "media/audio_debug_recordings_handler.cc",
|
| "media/audio_debug_recordings_handler.h",
|
| - "media/webrtc_event_log_handler.cc",
|
| - "media/webrtc_event_log_handler.h",
|
| - "media/webrtc_log_uploader.cc",
|
| - "media/webrtc_log_uploader.h",
|
| - "media/webrtc_log_util.cc",
|
| - "media/webrtc_log_util.h",
|
| - "media/webrtc_logging_handler_host.cc",
|
| - "media/webrtc_logging_handler_host.h",
|
| - "media/webrtc_rtp_dump_handler.cc",
|
| - "media/webrtc_rtp_dump_handler.h",
|
| - "media/webrtc_rtp_dump_writer.cc",
|
| - "media/webrtc_rtp_dump_writer.h",
|
| +
|
| + # TODO(brettw) should webrtc_log_list.cc go here?
|
| + "media/webrtc/audio_debug_recordings_handler.cc",
|
| + "media/webrtc/webrtc_event_log_handler.cc",
|
| + "media/webrtc/webrtc_event_log_handler.h",
|
| + "media/webrtc/webrtc_log_uploader.cc",
|
| + "media/webrtc/webrtc_log_uploader.h",
|
| + "media/webrtc/webrtc_log_util.cc",
|
| + "media/webrtc/webrtc_log_util.h",
|
| + "media/webrtc/webrtc_logging_handler_host.cc",
|
| + "media/webrtc/webrtc_logging_handler_host.h",
|
| + "media/webrtc/webrtc_rtp_dump_handler.cc",
|
| + "media/webrtc/webrtc_rtp_dump_handler.h",
|
| + "media/webrtc/webrtc_rtp_dump_writer.cc",
|
| + "media/webrtc/webrtc_rtp_dump_writer.h",
|
| ]
|
| }
|
| if (enable_service_discovery) {
|
| @@ -3996,8 +3997,8 @@ static_library("test_support") {
|
| "browsing_data/mock_browsing_data_service_worker_helper.h",
|
| "download/download_test_file_activity_observer.cc",
|
| "download/download_test_file_activity_observer.h",
|
| - "media/fake_desktop_media_list.cc",
|
| - "media/fake_desktop_media_list.h",
|
| + "media/webrtc/fake_desktop_media_list.cc",
|
| + "media/webrtc/fake_desktop_media_list.h",
|
| "net/dns_probe_test_util.cc",
|
| "net/dns_probe_test_util.h",
|
| "net/url_request_mock_util.cc",
|
|
|