| Index: remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java b/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
|
| index cfbbcbe2391a9775713b946059f341fd7f41051c..7894bd993a5705941d710d8c9dca727538a5c181 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java
|
| @@ -26,8 +26,7 @@ public class TouchInputHandler {
|
| private static final float EPSILON = 0.001f;
|
|
|
| private final List<Pair<Object, Event<?>>> mAttachedEvents = new ArrayList<>();
|
| - private final DesktopView mViewer;
|
| - private final Context mContext;
|
| + private final Desktop mDesktop;
|
| private final RenderData mRenderData;
|
| private final DesktopCanvas mDesktopCanvas;
|
| private final RenderStub mRenderStub;
|
| @@ -194,8 +193,7 @@ public class TouchInputHandler {
|
| Preconditions.notNull(renderStub);
|
| Preconditions.notNull(injector);
|
|
|
| - mViewer = viewer;
|
| - mContext = desktop;
|
| + mDesktop = desktop;
|
| mRenderStub = renderStub;
|
| mRenderData = new RenderData();
|
| mDesktopCanvas = new DesktopCanvas(renderStub, mRenderData);
|
| @@ -233,7 +231,7 @@ public class TouchInputHandler {
|
| }
|
| };
|
|
|
| - attachEvent(mViewer.onTouch(), new Event.ParameterRunnable<TouchEventParameter>() {
|
| + attachEvent(viewer.onTouch(), new Event.ParameterRunnable<TouchEventParameter>() {
|
| @Override
|
| public void run(TouchEventParameter parameter) {
|
| parameter.handled = handleTouchEvent(parameter.event);
|
| @@ -337,7 +335,7 @@ public class TouchInputHandler {
|
| setInputStrategy(new TouchInputStrategy(mRenderData, injector));
|
| } else {
|
| setInputStrategy(
|
| - new SimulatedTouchInputStrategy(mRenderData, injector, mContext));
|
| + new SimulatedTouchInputStrategy(mRenderData, injector, mDesktop));
|
| }
|
| break;
|
|
|
| @@ -479,10 +477,10 @@ public class TouchInputHandler {
|
| private boolean onSwipe() {
|
| if (mTotalMotionY > mSwipeThreshold) {
|
| // Swipe down occurred.
|
| - mViewer.showActionBar();
|
| + mDesktop.showSystemUi();
|
| } else if (mTotalMotionY < -mSwipeThreshold) {
|
| // Swipe up occurred.
|
| - mViewer.showKeyboard();
|
| + mDesktop.showKeyboard();
|
| } else {
|
| return false;
|
| }
|
|
|