| Index: remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java b/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
|
| index 488760bf15f6b2373de7bcdd28f0ce9f9d5c37e2..19d70e3189c315ed9a92491d3c2fa0020d96ab54 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/TouchInputStrategy.java
|
| @@ -8,7 +8,7 @@ import android.graphics.Matrix;
|
| import android.view.MotionEvent;
|
|
|
| import org.chromium.base.VisibleForTesting;
|
| -import org.chromium.chromoting.jni.JniInterface;
|
| +import org.chromium.chromoting.jni.Client;
|
| import org.chromium.chromoting.jni.TouchEventData;
|
|
|
| import java.util.ArrayList;
|
| @@ -37,15 +37,15 @@ public class TouchInputStrategy implements InputStrategyInterface {
|
| /**
|
| * This class provides the default implementation for injecting remote events.
|
| */
|
| - private static class DefaultInputInjector implements RemoteInputInjector {
|
| + private class DefaultInputInjector implements RemoteInputInjector {
|
| @Override
|
| public void injectMouseEvent(int x, int y, int button, boolean buttonDown) {
|
| - JniInterface.sendMouseEvent(x, y, button, buttonDown);
|
| + mClient.sendMouseEvent(x, y, button, buttonDown);
|
| }
|
|
|
| @Override
|
| public void injectTouchEvent(TouchEventData.EventType eventType, TouchEventData[] data) {
|
| - JniInterface.sendTouchEvent(eventType, data);
|
| + mClient.sendTouchEvent(eventType, data);
|
| }
|
| }
|
|
|
| @@ -77,10 +77,13 @@ public class TouchInputStrategy implements InputStrategyInterface {
|
|
|
| private final RenderData mRenderData;
|
|
|
| + private final Client mClient;
|
| +
|
| private RemoteInputInjector mRemoteInputInjector;
|
|
|
| - public TouchInputStrategy(RenderData renderData) {
|
| + public TouchInputStrategy(RenderData renderData, Client client) {
|
| mRenderData = renderData;
|
| + mClient = client;
|
| mRemoteInputInjector = new DefaultInputInjector();
|
| mQueuedEvents = new LinkedList<MotionEvent>();
|
|
|
|
|