| Index: remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| diff --git a/remoting/android/java/src/org/chromium/chromoting/Desktop.java b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| index 8e0117aaf7b6fd4901d5e810f2a2ecf7e68f2e6b..0bfbe3b8016a8e0ebd1b7ae929f90c027304d11d 100644
|
| --- a/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| +++ b/remoting/android/java/src/org/chromium/chromoting/Desktop.java
|
| @@ -18,7 +18,6 @@ import android.view.MotionEvent;
|
| import android.view.View;
|
| import android.view.View.OnLayoutChangeListener;
|
| import android.view.View.OnTouchListener;
|
| -import android.view.ViewGroup;
|
| import android.view.inputmethod.InputMethodManager;
|
|
|
| import org.chromium.chromoting.help.HelpContext;
|
| @@ -89,10 +88,9 @@ public class Desktop
|
| mToolbar = (Toolbar) findViewById(R.id.toolbar);
|
| setSupportActionBar(mToolbar);
|
|
|
| - DesktopView remoteHostDesktop = mClient.createDesktopView(this, mClient);
|
| - remoteHostDesktop.setLayoutParams(new ViewGroup.LayoutParams(
|
| - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
|
| - ((ViewGroup) findViewById(R.id.desktop_view_placeholder)).addView(remoteHostDesktop);
|
| + DesktopView remoteHostDesktop = (DesktopView) findViewById(R.id.desktop_view);
|
| + remoteHostDesktop.init(this);
|
| + mClient.getRenderController().reset(this, remoteHostDesktop);
|
|
|
| getSupportActionBar().setDisplayShowTitleEnabled(false);
|
| getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
|
|