media/base/android/media_jni_registrar.cc - 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: media/base/android/media_jni_registrar.cc

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: media/base/android/media_jni_registrar.cc

diff --git a/media/base/android/media_jni_registrar.cc b/media/base/android/media_jni_registrar.cc

index bc44d418f1ed5409b160aff14dbf3430e4661f79..6a6fa096135cb7fafa9d49bd3f486681b9cad9d6 100644

--- a/media/base/android/media_jni_registrar.cc

+++ b/media/base/android/media_jni_registrar.cc

@@ -8,13 +8,13 @@

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

-#include "media/base/android/media_player_bridge.h"

+#include "media/base/android/media_player_listener.h"

namespace media {

static base::android::RegistrationMethod kMediaRegisteredMethods[] = {

{ "MediaPlayerListener",

- MediaPlayerBridge::RegisterMediaPlayerListener },

+ MediaPlayerListener::RegisterMediaPlayerListener },

};

bool RegisterJni(JNIEnv* env) {