| Index: ui/android/ui_jni_registrar.cc
|
| diff --git a/ui/android/ui_jni_registrar.cc b/ui/android/ui_jni_registrar.cc
|
| index 4cfc267eeacfd1aee95e2ef4ed8423d752181fd5..49de9267636c87d497c9e8ef155e7a554519f39a 100644
|
| --- a/ui/android/ui_jni_registrar.cc
|
| +++ b/ui/android/ui_jni_registrar.cc
|
| @@ -7,13 +7,18 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| #include "ui/base/dialogs/select_file_dialog_android.h"
|
| +#include "ui/gfx/android/device_info.h"
|
| +#include "ui/gfx/android/java_bitmap.h"
|
| #include "ui/gfx/android/window_android.h"
|
|
|
| namespace ui {
|
| +namespace android {
|
|
|
| static base::android::RegistrationMethod kUiRegisteredMethods[] = {
|
| - { "NativeWindow", WindowAndroid::RegisterWindowAndroid },
|
| - { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog },
|
| + { "DeviceInfo", gfx::DeviceInfo::RegisterDeviceInfo },
|
| + { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap },
|
| + { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid },
|
| + { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog },
|
| };
|
|
|
| bool RegisterJni(JNIEnv* env) {
|
| @@ -21,4 +26,5 @@ bool RegisterJni(JNIEnv* env) {
|
| arraysize(kUiRegisteredMethods));
|
| }
|
|
|
| -} // namespace ui
|
| +} // namespace android
|
| +} // namespace ui
|
|
|