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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/android/media_jni_registrar.h" 5 #include "media/base/android/media_jni_registrar.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 10
11 #include "media/base/android/media_player_bridge.h" 11 #include "media/base/android/media_player_listener.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 static base::android::RegistrationMethod kMediaRegisteredMethods[] = { 15 static base::android::RegistrationMethod kMediaRegisteredMethods[] = {
16 { "MediaPlayerListener", 16 { "MediaPlayerListener",
17 MediaPlayerBridge::RegisterMediaPlayerListener }, 17 MediaPlayerListener::RegisterMediaPlayerListener },
18 }; 18 };
19 19
20 bool RegisterJni(JNIEnv* env) { 20 bool RegisterJni(JNIEnv* env) {
21 return base::android::RegisterNativeMethods( 21 return base::android::RegisterNativeMethods(
22 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods)); 22 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));
23 } 23 }
24 24
25 } // namespace media 25 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaPlayerListener.java ('k') | media/base/android/media_player_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698