Chromium Code Reviews| 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/base/dialogs/select_file_dialog_android.h" | 9 #include "ui/base/dialogs/select_file_dialog_android.h" |
| 10 #include "ui/gfx/android/device_info.h" | |
| 10 #include "ui/gfx/android/window_android.h" | 11 #include "ui/gfx/android/window_android.h" |
| 11 | 12 |
| 13 namespace gfx { | |
| 14 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.
| |
| 15 } | |
| 16 | |
| 12 namespace ui { | 17 namespace ui { |
| 18 namespace android { | |
| 13 | 19 |
| 14 static base::android::RegistrationMethod kUiRegisteredMethods[] = { | 20 static base::android::RegistrationMethod kUiRegisteredMethods[] = { |
| 15 { "NativeWindow", WindowAndroid::RegisterWindowAndroid }, | 21 { "DeviceInfo", gfx::DeviceInfo::RegisterDeviceInfo }, |
| 16 { "SelectFileDialog", SelectFileDialogImpl::RegisterSelectFileDialog }, | 22 { "JavaBitmap", gfx::RegisterBitmapAndroid }, |
| 23 { "NativeWindow", ui::WindowAndroid::RegisterWindowAndroid }, | |
| 24 { "SelectFileDialog", ui::SelectFileDialogImpl::RegisterSelectFileDialog }, | |
| 17 }; | 25 }; |
| 18 | 26 |
| 19 bool RegisterJni(JNIEnv* env) { | 27 bool RegisterJni(JNIEnv* env) { |
| 20 return RegisterNativeMethods(env, kUiRegisteredMethods, | 28 return RegisterNativeMethods(env, kUiRegisteredMethods, |
| 21 arraysize(kUiRegisteredMethods)); | 29 arraysize(kUiRegisteredMethods)); |
| 22 } | 30 } |
| 23 | 31 |
| 24 } // namespace ui | 32 } // namespace android |
| 33 } // namespace ui | |
| OLD | NEW |