| Index: remoting/client/jni/chromoting_jni_runtime.cc
|
| diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc
|
| index 7a234879151ada65306cde2c1783b2cde74092cd..06cd7fff11d2b8a9dfab941e23695abe49df9dea 100644
|
| --- a/remoting/client/jni/chromoting_jni_runtime.cc
|
| +++ b/remoting/client/jni/chromoting_jni_runtime.cc
|
| @@ -103,38 +103,42 @@ static void ScheduleRedraw(JNIEnv* env, jclass clazz) {
|
| remoting::ChromotingJniRuntime::GetInstance()->session()->RedrawDesktop();
|
| }
|
|
|
| -static void MouseAction(JNIEnv* env,
|
| - jclass clazz,
|
| - jint x,
|
| - jint y,
|
| - jint whichButton,
|
| - jboolean buttonDown) {
|
| +static void SendMouseEvent(JNIEnv* env,
|
| + jclass clazz,
|
| + jint x,
|
| + jint y,
|
| + jint whichButton,
|
| + jboolean buttonDown) {
|
| // Button must be within the bounds of the MouseEvent_MouseButton enum.
|
| DCHECK(whichButton >= 0 && whichButton < 5);
|
|
|
| - remoting::ChromotingJniRuntime::GetInstance()->session()->PerformMouseAction(
|
| - x,
|
| - y,
|
| + remoting::ChromotingJniRuntime::GetInstance()->session()->SendMouseEvent(
|
| + x, y,
|
| static_cast<remoting::protocol::MouseEvent_MouseButton>(whichButton),
|
| buttonDown);
|
| }
|
|
|
| -static void MouseWheelDeltaAction(JNIEnv* env,
|
| - jclass clazz,
|
| - jint delta_x,
|
| - jint delta_y) {
|
| - remoting::ChromotingJniRuntime::GetInstance()
|
| - ->session()
|
| - ->PerformMouseWheelDeltaAction(delta_x, delta_y);
|
| +static void SendMouseWheelEvent(JNIEnv* env,
|
| + jclass clazz,
|
| + jint delta_x,
|
| + jint delta_y) {
|
| + remoting::ChromotingJniRuntime::GetInstance()->session()->SendMouseWheelEvent(
|
| + delta_x, delta_y);
|
| }
|
|
|
| -static void KeyboardAction(JNIEnv* env,
|
| - jclass clazz,
|
| - jint keyCode,
|
| - jboolean keyDown) {
|
| - remoting::ChromotingJniRuntime::GetInstance()
|
| - ->session()
|
| - ->PerformKeyboardAction(keyCode, keyDown);
|
| +static void SendKeyEvent(JNIEnv* env,
|
| + jclass clazz,
|
| + jint keyCode,
|
| + jboolean keyDown) {
|
| + remoting::ChromotingJniRuntime::GetInstance()->session()->SendKeyEvent(
|
| + keyCode, keyDown);
|
| +}
|
| +
|
| +static void SendTextEvent(JNIEnv* env,
|
| + jclass clazz,
|
| + jstring text) {
|
| + remoting::ChromotingJniRuntime::GetInstance()->session()->SendTextEvent(
|
| + ConvertJavaStringToUTF8(env, text));
|
| }
|
|
|
| // ChromotingJniRuntime implementation.
|
|
|