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 "content/common/android/common_jni_registrar.h" | 5 #include "content/common/android/common_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 #include "content/common/android/hash_set.h" | 10 #include "content/common/android/hash_set.h" |
| 11 #include "content/common/android/media_metadata_android.h" |
11 | 12 |
12 namespace { | 13 namespace { |
13 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 14 base::android::RegistrationMethod kContentRegisteredMethods[] = { |
14 { "HashSet", content::RegisterHashSet }, | 15 { "HashSet", content::RegisterHashSet }, |
| 16 { "MediaMetadataAndroid", content::MediaMetadataAndroid::Register }, |
15 }; | 17 }; |
16 | 18 |
17 } // namespace | 19 } // namespace |
18 | 20 |
19 namespace content { | 21 namespace content { |
20 namespace android { | 22 namespace android { |
21 | 23 |
22 bool RegisterCommonJni(JNIEnv* env) { | 24 bool RegisterCommonJni(JNIEnv* env) { |
23 return RegisterNativeMethods(env, kContentRegisteredMethods, | 25 return RegisterNativeMethods(env, kContentRegisteredMethods, |
24 arraysize(kContentRegisteredMethods)); | 26 arraysize(kContentRegisteredMethods)); |
25 } | 27 } |
26 | 28 |
27 } // namespace android | 29 } // namespace android |
28 } // namespace content | 30 } // namespace content |
OLD | NEW |