| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/base/android/ui_base_jni_registrar.h" | 5 #include "ui/base/android/ui_base_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 "ui/base/android/view_android.h" | 9 #include "ui/base/android/view_android.h" |
| 10 #include "ui/base/android/window_android.h" | 10 #include "ui/base/android/window_android.h" |
| 11 #include "ui/base/touch/touch_device.h" | |
| 12 | 11 |
| 13 namespace ui { | 12 namespace ui { |
| 14 namespace android { | 13 namespace android { |
| 15 | 14 |
| 16 static base::android::RegistrationMethod kUiRegisteredMethods[] = { | 15 static base::android::RegistrationMethod kUiRegisteredMethods[] = { |
| 17 { "TouchDevice", RegisterTouchDeviceAndroid }, | |
| 18 { "ViewAndroid", ViewAndroid::RegisterViewAndroid }, | 16 { "ViewAndroid", ViewAndroid::RegisterViewAndroid }, |
| 19 { "WindowAndroid", WindowAndroid::RegisterWindowAndroid }, | 17 { "WindowAndroid", WindowAndroid::RegisterWindowAndroid }, |
| 20 }; | 18 }; |
| 21 | 19 |
| 22 bool RegisterJni(JNIEnv* env) { | 20 bool RegisterJni(JNIEnv* env) { |
| 23 return RegisterNativeMethods(env, kUiRegisteredMethods, | 21 return RegisterNativeMethods(env, kUiRegisteredMethods, |
| 24 arraysize(kUiRegisteredMethods)); | 22 arraysize(kUiRegisteredMethods)); |
| 25 } | 23 } |
| 26 | 24 |
| 27 } // namespace android | 25 } // namespace android |
| 28 } // namespace ui | 26 } // namespace ui |
| OLD | NEW |