media/media.gyp - Issue 10919075: Move android mediaplayer from render process to browser process. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(1565)

My Issues | Starred Open | Closed | All

Unified Diff: media/media.gyp

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:

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

« no previous file with comments | « media/base/android/media_player_listener.cc ('k') | webkit/media/android/media_player_bridge_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index 0d23796dc2568fb53894542ab8f092ce14316637..264653bb532a41da9b04811354ab4642be3d13e8 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -147,8 +147,12 @@

'audio/win/wavein_input_win.h',

'audio/win/waveout_output_win.cc',

'audio/win/waveout_output_win.h',

+ 'base/android/cookie_getter.cc',

+ 'base/android/cookie_getter.h',

'base/android/media_jni_registrar.cc',

'base/android/media_jni_registrar.h',

+ 'base/android/media_player_bridge_manager.cc',

+ 'base/android/media_player_bridge_manager.h',

'base/audio_decoder.cc',

'base/audio_decoder.h',

'base/audio_decoder_config.cc',

@@ -1153,6 +1157,8 @@

'sources': [

'base/android/media_player_bridge.cc',

'base/android/media_player_bridge.h',

+ 'base/android/media_player_listener.cc',

+ 'base/android/media_player_listener.h',

],

'dependencies': [

'../base/base.gyp:base',

« no previous file with comments | « media/base/android/media_player_listener.cc ('k') | webkit/media/android/media_player_bridge_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698