Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Unified Diff: remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java

Issue 1537183002: Refactor Chromoting JNI code to use jni/Client (Java changes only). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Suppress FindBugs warning Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java b/remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java
index 326eff9778ce779e091c5f70182e081e94afe6a5..c9dcf4bdaf1745ccc1791fe2f11c3c565d4b1f36 100644
--- a/remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java
+++ b/remoting/android/java/src/org/chromium/chromoting/TrackpadInputStrategy.java
@@ -7,7 +7,7 @@ package org.chromium.chromoting;
import android.graphics.Point;
import android.view.MotionEvent;
-import org.chromium.chromoting.jni.JniInterface;
+import org.chromium.chromoting.jni.Client;
/**
* Defines a set of behavior and methods to simulate trackpad behavior when responding to
@@ -16,12 +16,14 @@ import org.chromium.chromoting.jni.JniInterface;
*/
public class TrackpadInputStrategy implements InputStrategyInterface {
private final RenderData mRenderData;
+ private final Client mClient;
/** Mouse-button currently held down, or BUTTON_UNDEFINED otherwise. */
private int mHeldButton = TouchInputHandlerInterface.BUTTON_UNDEFINED;
- public TrackpadInputStrategy(RenderData renderData) {
+ public TrackpadInputStrategy(RenderData renderData, Client client) {
mRenderData = renderData;
+ mClient = client;
synchronized (mRenderData) {
mRenderData.drawCursor = true;
@@ -44,7 +46,7 @@ public class TrackpadInputStrategy implements InputStrategyInterface {
@Override
public void onScroll(float distanceX, float distanceY) {
- JniInterface.sendMouseWheelEvent((int) -distanceX, (int) -distanceY);
+ mClient.sendMouseWheelEvent((int) -distanceX, (int) -distanceY);
}
@Override
@@ -58,7 +60,7 @@ public class TrackpadInputStrategy implements InputStrategyInterface {
@Override
public void injectCursorMoveEvent(int x, int y) {
- JniInterface.sendMouseEvent(x, y, TouchInputHandlerInterface.BUTTON_UNDEFINED, false);
+ mClient.sendMouseEvent(x, y, TouchInputHandlerInterface.BUTTON_UNDEFINED, false);
}
@Override
@@ -81,6 +83,6 @@ public class TrackpadInputStrategy implements InputStrategyInterface {
synchronized (mRenderData) {
cursorPosition = mRenderData.getCursorPosition();
}
- JniInterface.sendMouseEvent(cursorPosition.x, cursorPosition.y, button, pressed);
+ mClient.sendMouseEvent(cursorPosition.x, cursorPosition.y, button, pressed);
}
}

Powered by Google App Engine
This is Rietveld 408576698