Chromium Code Reviews| 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..ba4a9de4c1b99f71585acaf8c93d5863c02fb8ee 100644 |
| --- a/ui/android/ui_jni_registrar.cc |
| +++ b/ui/android/ui_jni_registrar.cc |
| @@ -7,13 +7,21 @@ |
| #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/window_android.h" |
| +namespace gfx { |
| +bool RegisterBitmapAndroid(JNIEnv* env); |
|
nilesh
2013/01/17 02:26:49
This is weird. Why is this declared here instead o
aruslan
2013/01/17 02:45:02
Done.
|
| +} |
| + |
| namespace ui { |
| +namespace android { |
| static base::android::RegistrationMethod kUiRegisteredMethods[] = { |
| - { "NativeWindow", WindowAndroid::RegisterWindowAndroid }, |
| - { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog }, |
| + { "DeviceInfo", gfx::DeviceInfo::RegisterDeviceInfo }, |
| + { "JavaBitmap", gfx::RegisterBitmapAndroid }, |
| + { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid }, |
| + { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog }, |
| }; |
| bool RegisterJni(JNIEnv* env) { |
| @@ -21,4 +29,5 @@ bool RegisterJni(JNIEnv* env) { |
| arraysize(kUiRegisteredMethods)); |
| } |
| -} // namespace ui |
| +} // namespace android |
| +} // namespace ui |