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 "ui/gfx/android/device_display_info.h" | |
10 #include "ui/gfx/android/java_bitmap.h" | 9 #include "ui/gfx/android/java_bitmap.h" |
10 #include "ui/gfx/android/shared_device_display_info.h" | |
11 | 11 |
12 namespace gfx { | 12 namespace gfx { |
13 namespace android { | 13 namespace android { |
14 | 14 |
15 static base::android::RegistrationMethod kGfxRegisteredMethods[] = { | 15 static base::android::RegistrationMethod kGfxRegisteredMethods[] = { |
16 { "DeviceDisplayInfo", gfx::DeviceDisplayInfo::RegisterDeviceDisplayInfo }, | 16 { "SharedDeviceDisplayInfo", |
17 gfx::SharedDeviceDisplayInfo::RegisterSharedDeviceDisplayInfo }, | |
Alexei Svitkine (slow)
2013/10/22 21:01:54
Nit: Remove gfx:: prefix here and below since this
ostap
2013/10/22 21:40:42
Done.
| |
17 { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap }, | 18 { "JavaBitmap", gfx::JavaBitmap::RegisterJavaBitmap }, |
18 }; | 19 }; |
19 | 20 |
20 bool RegisterJni(JNIEnv* env) { | 21 bool RegisterJni(JNIEnv* env) { |
21 return RegisterNativeMethods(env, kGfxRegisteredMethods, | 22 return RegisterNativeMethods(env, kGfxRegisteredMethods, |
22 arraysize(kGfxRegisteredMethods)); | 23 arraysize(kGfxRegisteredMethods)); |
23 } | 24 } |
24 | 25 |
25 } // namespace android | 26 } // namespace android |
26 } // namespace gfx | 27 } // namespace gfx |
OLD | NEW |