| Index: ui/android/view_android.cc
|
| diff --git a/ui/android/view_android.cc b/ui/android/view_android.cc
|
| index 8503cf837fff15a87f1cad682ea9519ffae8e002..7b5e24c2d3e93efba7af13074f410be8bcc3544e 100644
|
| --- a/ui/android/view_android.cc
|
| +++ b/ui/android/view_android.cc
|
| @@ -16,6 +16,7 @@
|
| #include "ui/android/window_android.h"
|
| #include "ui/base/layout.h"
|
| #include "ui/events/android/motion_event_android.h"
|
| +#include "ui/gfx/android/java_bitmap.h"
|
| #include "url/gurl.h"
|
|
|
| namespace ui {
|
| @@ -248,6 +249,24 @@ bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
|
| jimage);
|
| }
|
|
|
| +void ViewAndroid::OnCursorChanged(bool to_custom_cursor,
|
| + int type,
|
| + const SkBitmap& custom_image,
|
| + const gfx::Point& hotspot) {
|
| + ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| + if (delegate.is_null())
|
| + return;
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + if (to_custom_cursor) {
|
| + ScopedJavaLocalRef<jobject> java_bitmap =
|
| + gfx::ConvertToJavaBitmap(&custom_image);
|
| + Java_ViewAndroidDelegate_onCursorChangedToCustom(env, delegate, java_bitmap,
|
| + hotspot.x(), hotspot.y());
|
| + } else {
|
| + Java_ViewAndroidDelegate_onCursorChanged(env, delegate, type);
|
| + }
|
| +}
|
| +
|
| void ViewAndroid::OnBackgroundColorChanged(unsigned int color) {
|
| ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| if (delegate.is_null())
|
|
|