| Index: ui/android/view_android.cc
|
| diff --git a/ui/android/view_android.cc b/ui/android/view_android.cc
|
| index 43f084fcf737da20491fae94808a83471544bcda..e1716c141bd0ef8a21a42239dded78ab29dfbace 100644
|
| --- a/ui/android/view_android.cc
|
| +++ b/ui/android/view_android.cc
|
| @@ -7,14 +7,17 @@
|
| #include <algorithm>
|
|
|
| #include "base/android/jni_android.h"
|
| +#include "base/android/jni_string.h"
|
| #include "cc/layers/layer.h"
|
| #include "jni/ViewAndroidDelegate_jni.h"
|
| #include "ui/android/window_android.h"
|
| #include "ui/display/display.h"
|
| #include "ui/display/screen.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace ui {
|
|
|
| +using base::android::ConvertUTF8ToJavaString;
|
| using base::android::JavaRef;
|
| using base::android::ScopedJavaLocalRef;
|
|
|
| @@ -215,7 +218,9 @@ bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
|
| if (delegate.is_null())
|
| return false;
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| - return Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext,
|
| + return Java_ViewAndroidDelegate_startDragAndDrop(env,
|
| + delegate,
|
| + jtext,
|
| jimage);
|
| }
|
|
|
| @@ -241,4 +246,52 @@ bool ViewAndroid::OnTouchEventInternal(const MotionEventData& event) {
|
| return false;
|
| }
|
|
|
| +void ViewAndroid::OnBackgroundColorChanged(unsigned int color) {
|
| + ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| + if (delegate.is_null())
|
| + return;
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + Java_ViewAndroidDelegate_onBackgroundColorChanged(env,
|
| + delegate,
|
| + color);
|
| +}
|
| +
|
| +void ViewAndroid::OnTopControlsChanged(float top_controls_offset,
|
| + float top_content_offset) {
|
| + ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| + if (delegate.is_null())
|
| + return;
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + Java_ViewAndroidDelegate_onTopControlsChanged(env,
|
| + delegate,
|
| + top_controls_offset,
|
| + top_content_offset);
|
| +}
|
| +
|
| +void ViewAndroid::OnBottomControlsChanged(float bottom_controls_offset,
|
| + float bottom_content_offset) {
|
| + ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| + if (delegate.is_null())
|
| + return;
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + Java_ViewAndroidDelegate_onBottomControlsChanged(env,
|
| + delegate,
|
| + bottom_controls_offset,
|
| + bottom_content_offset);
|
| +}
|
| +
|
| +void ViewAndroid::StartContentIntent(const GURL& content_url,
|
| + bool is_main_frame) {
|
| + ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
|
| + if (delegate.is_null())
|
| + return;
|
| + JNIEnv* env = base::android::AttachCurrentThread();
|
| + ScopedJavaLocalRef<jstring> jcontent_url =
|
| + ConvertUTF8ToJavaString(env, content_url.spec());
|
| + Java_ViewAndroidDelegate_onStartContentIntent(env,
|
| + delegate,
|
| + jcontent_url,
|
| + is_main_frame);
|
| +
|
| +}
|
| } // namespace ui
|
|
|