Index: ui/gfx/android/gfx_jni_registrar.cc |
diff --git a/ui/gfx/android/gfx_jni_registrar.cc b/ui/gfx/android/gfx_jni_registrar.cc |
index 5b9ab1dbf1558d7e3bc1a89c7b2242bbcd42b529..d48c01fdeb35a9997fc8ec0dd4f8c08c452f4d46 100644 |
--- a/ui/gfx/android/gfx_jni_registrar.cc |
+++ b/ui/gfx/android/gfx_jni_registrar.cc |
@@ -6,19 +6,17 @@ |
#include "base/android/jni_android.h" |
#include "base/android/jni_registrar.h" |
+#include "ui/gfx/android/device_display_info.h" |
#include "ui/gfx/android/java_bitmap.h" |
-#include "ui/gfx/android/shared_device_display_info.h" |
#include "ui/gfx/android/view_configuration.h" |
namespace gfx { |
namespace android { |
static base::android::RegistrationMethod kGfxRegisteredMethods[] = { |
- { "SharedDeviceDisplayInfo", |
- SharedDeviceDisplayInfo::RegisterSharedDeviceDisplayInfo }, |
- { "JavaBitmap", JavaBitmap::RegisterJavaBitmap }, |
- { "ViewConfiguration", ViewConfiguration::RegisterViewConfiguration } |
-}; |
+ {"DeviceDisplayInfo", DeviceDisplayInfo::RegisterDeviceDisplayInfo}, |
+ {"JavaBitmap", JavaBitmap::RegisterJavaBitmap}, |
+ {"ViewConfiguration", ViewConfiguration::RegisterViewConfiguration}}; |
bool RegisterJni(JNIEnv* env) { |
return RegisterNativeMethods(env, kGfxRegisteredMethods, |