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 "ui/android/ui_jni_registrar.h" | 5 #include "ui/android/ui_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/android/view_android.h" | 9 #include "ui/android/view_android.h" |
10 #include "ui/android/window_android.h" | 10 #include "ui/android/window_android.h" |
11 #include "ui/base/clipboard/clipboard_android_initialization.h" | 11 #include "ui/base/clipboard/clipboard_android_initialization.h" |
12 #include "ui/base/l10n/l10n_util_android.h" | 12 #include "ui/base/l10n/l10n_util_android.h" |
13 #include "ui/gfx/android/device_display_info.h" | 13 #include "ui/gfx/android/device_display_info.h" |
14 #include "ui/gfx/android/java_bitmap.h" | 14 #include "ui/gfx/android/java_bitmap.h" |
15 | 15 |
16 namespace ui { | 16 namespace ui { |
17 namespace android { | 17 namespace android { |
18 | 18 |
19 static base::android::RegistrationMethod kUiRegisteredMethods[] = { | 19 static base::android::RegistrationMethod kUiRegisteredMethods[] = { |
20 { "Clipboard", ui::RegisterClipboardAndroid }, | 20 { "Clipboard", ui::RegisterClipboardAndroid }, |
| 21 { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo }, |
| 22 { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap }, |
21 { "LocalizationUtils", l10n_util::RegisterLocalizationUtil }, | 23 { "LocalizationUtils", l10n_util::RegisterLocalizationUtil }, |
22 { "ViewAndroid", ui::ViewAndroid::RegisterViewAndroid }, | 24 { "ViewAndroid", ui::ViewAndroid::RegisterViewAndroid }, |
23 { "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid }, | 25 { "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid }, |
24 }; | 26 }; |
25 | 27 |
26 bool RegisterJni(JNIEnv* env) { | 28 bool RegisterJni(JNIEnv* env) { |
27 return RegisterNativeMethods(env, kUiRegisteredMethods, | 29 return RegisterNativeMethods(env, kUiRegisteredMethods, |
28 arraysize(kUiRegisteredMethods)); | 30 arraysize(kUiRegisteredMethods)); |
29 } | 31 } |
30 | 32 |
31 } // namespace android | 33 } // namespace android |
32 } // namespace ui | 34 } // namespace ui |
OLD | NEW |