webkit/media/webkit_media.gypi - Issue 10919075: Move android mediaplayer from render process to browser process.

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: webkit/media/webkit_media.gypi

Issue 10919075: Move android mediaplayer from render process to browser process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: addressing comments and resolving merge conflicts Created 8 years, 3 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:

Index: webkit/media/webkit_media.gypi

diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi

index db0899244eb83436a1709b070a8364e32d449723..77bb53f0d7c7d658d81d0a0fc1e520cd5d38fea9 100644

--- a/webkit/media/webkit_media.gypi

+++ b/webkit/media/webkit_media.gypi

@@ -18,9 +18,15 @@

'android/audio_decoder_android.cc',

'android/media_metadata_android.cc',

'android/media_metadata_android.h',

+ 'android/media_player_bridge_manager_impl.cc',

+ 'android/media_player_bridge_manager_impl.h',

'android/stream_texture_factory_android.h',

'android/webmediaplayer_android.cc',

'android/webmediaplayer_android.h',

+ 'android/webmediaplayer_impl_android.cc',

+ 'android/webmediaplayer_impl_android.h',

+ 'android/webmediaplayer_in_process_android.cc',

+ 'android/webmediaplayer_in_process_android.h',

'android/webmediaplayer_manager_android.cc',

'android/webmediaplayer_manager_android.h',

'android/webmediaplayer_proxy_android.cc',