media/base/android/media_jni_registrar.cc - Issue 2178973004: DialogSurfaceManager implementation.

Side by Side Diff: media/base/android/media_jni_registrar.cc

Issue 2178973004: DialogSurfaceManager implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: removed IDialogSurfaceActivityMapper from common.aidl Created 4 years 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

« media/base/android/java/src/org/chromium/media/DialogSurfaceWrapper.java ('K') | « media/base/android/java/src/org/chromium/media/common.aidl ('k') | ui/android/java/src/org/chromium/ui/base/WindowAndroid.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/android/jni_android.h"	7 #include "base/android/jni_android.h"

8 #include "base/android/jni_registrar.h"	8 #include "base/android/jni_registrar.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10	10

11 #include "media/audio/android/audio_manager_android.h"	11 #include "media/audio/android/audio_manager_android.h"

12 #include "media/audio/android/audio_record_input.h"	12 #include "media/audio/android/audio_record_input.h"

	13 #include "media/base/android/dialog_surface_callback.h"

	14 #include "media/base/android/media_codec_util.h"
	boliu 2017/01/04 01:48:45 random new include? random new include? liberato (no reviews please) 2017/01/11 22:17:58 Done. Show quoted text On 2017/01/04 01:48:45, boliu wrote: > random new include? Done.
13 #include "media/base/android/media_drm_bridge.h"	15 #include "media/base/android/media_drm_bridge.h"

14 #include "media/base/android/media_player_bridge.h"	16 #include "media/base/android/media_player_bridge.h"

15 #include "media/base/android/media_player_listener.h"	17 #include "media/base/android/media_player_listener.h"

16 #include "media/base/android/media_server_crash_listener.h"	18 #include "media/base/android/media_server_crash_listener.h"

17	19

18 namespace media {	20 namespace media {

19	21

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

21 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager},	23 {"AudioManagerAndroid", AudioManagerAndroid::RegisterAudioManager},

22 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput},	24 {"AudioRecordInput", AudioRecordInputStream::RegisterAudioRecordInput},

	25 {"DialogSurfaceCallback",

	26 DialogSurfaceCallback::RegisterDialogSurfaceCallback},

23 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},	27 {"MediaDrmBridge", MediaDrmBridge::RegisterMediaDrmBridge},

24 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},	28 {"MediaPlayerBridge", MediaPlayerBridge::RegisterMediaPlayerBridge},

25 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},	29 {"MediaPlayerListener", MediaPlayerListener::RegisterMediaPlayerListener},

26 {"MediaServerCrashListener",	30 {"MediaServerCrashListener",

27 MediaServerCrashListener::RegisterMediaServerCrashListener},	31 MediaServerCrashListener::RegisterMediaServerCrashListener},

28 };	32 };

29	33

30 bool RegisterJni(JNIEnv* env) {	34 bool RegisterJni(JNIEnv* env) {

31 return base::android::RegisterNativeMethods(	35 return base::android::RegisterNativeMethods(

32 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));	36 env, kMediaRegisteredMethods, arraysize(kMediaRegisteredMethods));

33 }	37 }

34	38

35 } // namespace media	39 } // namespace media

OLD	NEW