content/content_browser.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: content/content_browser.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: content/content_browser.gypi

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

index eb5c5edf29deb056199a1a3b08acd2bdfe3d190f..0c8783922ff1abd93da279275b04f0a070c2ebd3 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -203,6 +203,8 @@

'browser/android/content_view_core_impl.h',

'browser/android/content_view_statics.cc',

'browser/android/content_view_statics.h',

+ 'browser/android/cookie_getter_impl.cc',

+ 'browser/android/cookie_getter_impl.h',

'browser/android/download_controller.cc',

'browser/android/download_controller.h',

'browser/android/devtools_auth.cc',

@@ -210,8 +212,12 @@

'browser/android/draw_delegate_impl.cc',

'browser/android/load_url_params.cc',

'browser/android/load_url_params.h',

+ 'browser/android/media_player_manager_android.cc',

+ 'browser/android/media_player_manager_android.h',

'browser/android/sandboxed_process_launcher.cc',

'browser/android/sandboxed_process_launcher.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/web_contents_observer_android.cc',

« no previous file with comments | « content/common/view_messages.h ('k') | content/content_jni.gypi » ('j') | no next file with comments »