| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gfx/android/gfx_jni_registrar.h" | 5 #include "ui/gfx/android/gfx_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 "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "ui/gfx/android/java_bitmap.h" | |
| 11 #include "ui/gfx/android/shared_device_display_info.h" | 10 #include "ui/gfx/android/shared_device_display_info.h" |
| 12 #include "ui/gfx/android/view_configuration.h" | 11 #include "ui/gfx/android/view_configuration.h" |
| 13 | 12 |
| 14 namespace gfx { | 13 namespace gfx { |
| 15 namespace android { | 14 namespace android { |
| 16 | 15 |
| 17 static base::android::RegistrationMethod kGfxRegisteredMethods[] = { | 16 static base::android::RegistrationMethod kGfxRegisteredMethods[] = { |
| 18 { "SharedDeviceDisplayInfo", | 17 { "SharedDeviceDisplayInfo", |
| 19 SharedDeviceDisplayInfo::RegisterSharedDeviceDisplayInfo }, | 18 SharedDeviceDisplayInfo::RegisterSharedDeviceDisplayInfo }, |
| 20 { "JavaBitmap", JavaBitmap::RegisterJavaBitmap }, | |
| 21 { "ViewConfiguration", ViewConfiguration::RegisterViewConfiguration } | 19 { "ViewConfiguration", ViewConfiguration::RegisterViewConfiguration } |
| 22 }; | 20 }; |
| 23 | 21 |
| 24 bool RegisterJni(JNIEnv* env) { | 22 bool RegisterJni(JNIEnv* env) { |
| 25 return RegisterNativeMethods(env, kGfxRegisteredMethods, | 23 return RegisterNativeMethods(env, kGfxRegisteredMethods, |
| 26 arraysize(kGfxRegisteredMethods)); | 24 arraysize(kGfxRegisteredMethods)); |
| 27 } | 25 } |
| 28 | 26 |
| 29 } // namespace android | 27 } // namespace android |
| 30 } // namespace gfx | 28 } // namespace gfx |
| OLD | NEW |