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