content/content_browser.gypi - Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_browser.gypi

Issue 1698933004: Make MediaSession a runtime-enabled feature on Desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove windows specific stuff Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/media/session/media_session_delegate_android.h ('K') | « content/browser/web_contents/web_contents_impl.cc ('k') | content/content_jni.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index e0dac552e0387d1095162665f440c492c52493ab..d2a13b13cc845a31bcb811d5fee5b2d2736002b2 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -1022,13 +1022,6 @@

'browser/media/android/browser_surface_view_manager.h',

'browser/media/android/media_resource_getter_impl.cc',

'browser/media/android/media_resource_getter_impl.h',

- 'browser/media/android/media_session.cc',

- 'browser/media/android/media_session.h',

- 'browser/media/android/media_session_controller.cc',

- 'browser/media/android/media_session_controller.h',

- 'browser/media/android/media_session_observer.h',

- 'browser/media/android/media_session_uma_helper.cc',

- 'browser/media/android/media_session_uma_helper.h',

'browser/media/android/media_throttler.cc',

'browser/media/android/media_throttler.h',

'browser/media/android/media_web_contents_observer_android.cc',

@@ -1069,6 +1062,19 @@

'browser/media/media_web_contents_observer.h',

'browser/media/midi_host.cc',

'browser/media/midi_host.h',

+ 'browser/media/session/media_session.cc',

+ 'browser/media/session/media_session.h',

+ 'browser/media/session/media_session_controller.cc',

+ 'browser/media/session/media_session_controller.h',

+ 'browser/media/session/media_session_controllers_manager.cc',

+ 'browser/media/session/media_session_controllers_manager.h',

+ 'browser/media/session/media_session_delegate.h',

+ 'browser/media/session/media_session_delegate_android.h',

+ 'browser/media/session/media_session_delegate_android.cc',

+ 'browser/media/session/media_session_delegate_default.cc',

+ 'browser/media/session/media_session_observer.h',

+ 'browser/media/session/media_session_uma_helper.cc',

+ 'browser/media/session/media_session_uma_helper.h',

'browser/media/webrtc/webrtc_identity_store.cc',

'browser/media/webrtc/webrtc_identity_store.h',

'browser/media/webrtc/webrtc_identity_store_backend.cc',

@@ -2066,6 +2072,7 @@

'browser/geolocation/device_data_provider.cc',

'browser/geolocation/empty_device_data_provider.cc',

'browser/geolocation/wifi_data_provider_common.cc',

+ 'browser/media/session/media_session_delegate_default.cc',

'browser/power_usage_monitor_impl.cc',

'browser/power_usage_monitor_impl.h',

'browser/renderer_host/begin_frame_observer_proxy.cc',