OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/public/android/blimp_jni_registrar.h" | 5 #include "blimp/client/public/android/blimp_jni_registrar.h" |
6 | 6 |
7 #include "base/android/jni_registrar.h" | 7 #include "base/android/jni_registrar.h" |
8 #include "blimp/client/core/android/blimp_client_context_impl_android.h" | 8 #include "blimp/client/core/android/blimp_client_context_impl_android.h" |
9 #include "blimp/client/core/contents/android/blimp_contents_jni_registrar.h" | 9 #include "blimp/client/core/contents/android/blimp_contents_jni_registrar.h" |
| 10 #include "blimp/client/core/settings/android/blimp_settings_android.h" |
10 | 11 |
11 namespace blimp { | 12 namespace blimp { |
12 namespace client { | 13 namespace client { |
13 namespace { | 14 namespace { |
14 | 15 |
15 base::android::RegistrationMethod kBlimpRegistrationMethods[] = { | 16 base::android::RegistrationMethod kBlimpRegistrationMethods[] = { |
16 {"BlimpClientContextImplAndroid", | 17 {"BlimpClientContextImplAndroid", |
17 BlimpClientContextImplAndroid::RegisterJni}, | 18 BlimpClientContextImplAndroid::RegisterJni}, |
18 {"BlimpContentsJni", RegisterBlimpContentsJni}, | 19 {"BlimpContentsJni", RegisterBlimpContentsJni}, |
| 20 {"BlimpSettingsAndroid", BlimpSettingsAndroid::RegisterJni}, |
19 }; | 21 }; |
20 | 22 |
21 } // namespace | 23 } // namespace |
22 | 24 |
23 // This method is declared in | 25 // This method is declared in |
24 // //blimp/client/public/android/blimp_jni_registrar.h, and either this function | 26 // //blimp/client/public/android/blimp_jni_registrar.h, and either this function |
25 // or the one in //blimp/client/core/android/dummy_blimp_jni_registrar.cc | 27 // or the one in //blimp/client/core/android/dummy_blimp_jni_registrar.cc |
26 // should be linked in to any binary blimp::client::RegisterBlimpJni. | 28 // should be linked in to any binary blimp::client::RegisterBlimpJni. |
27 bool RegisterBlimpJni(JNIEnv* env) { | 29 bool RegisterBlimpJni(JNIEnv* env) { |
28 return base::android::RegisterNativeMethods( | 30 return base::android::RegisterNativeMethods( |
29 env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods)); | 31 env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods)); |
30 } | 32 } |
31 | 33 |
32 } // namespace client | 34 } // namespace client |
33 } // namespace blimp | 35 } // namespace blimp |
OLD | NEW |