Hooking up Blimp IME with BlimpContents

blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java

Index: blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
index ae60b5e1c561018f4f67a4363ae22f3f01a525b4..f4344f4ccc9df3bc31deae5c277b2459a48447ac 100644
--- a/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
+++ b/blimp/client/app/android/java/src/org/chromium/blimp/BlimpRendererActivity.java
@@ -20,13 +20,13 @@ import org.chromium.blimp.auth.RetryingTokenSource;
 import org.chromium.blimp.auth.TokenSource;
 import org.chromium.blimp.auth.TokenSourceImpl;
 import org.chromium.blimp.core.BlimpClientSwitches;
-import org.chromium.blimp.input.ImeHelperDialog;
 import org.chromium.blimp.preferences.PreferencesUtil;
 import org.chromium.blimp.session.BlimpClientSession;
 import org.chromium.blimp.session.EngineInfo;
 import org.chromium.blimp.session.TabControlFeature;
 import org.chromium.blimp.toolbar.Toolbar;
 import org.chromium.blimp.toolbar.ToolbarMenu;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.widget.Toast;
 
 /**
@@ -53,7 +53,7 @@ public class BlimpRendererActivity
     private Toolbar mToolbar;
     private BlimpClientSession mBlimpClientSession;
     private TabControlFeature mTabControlFeature;
-    private ImeHelperDialog mImeHelperDialog;
+    private WindowAndroid mWindowAndroid;
 
     private Handler mHandler = new Handler();
 
@@ -102,11 +102,6 @@ public class BlimpRendererActivity
             mToolbar = null;
         }
 
-        if (mImeHelperDialog != null) {
-            mImeHelperDialog.destroy();
-            mImeHelperDialog = null;
-        }
-
         if (mTokenSource != null) {
             mTokenSource.destroy();
             mTokenSource = null;
@@ -158,7 +153,9 @@ public class BlimpRendererActivity
 
         setContentView(R.layout.blimp_main);
 
-        mBlimpClientSession = new BlimpClientSession(PreferencesUtil.findAssignerUrl(this));
+        mWindowAndroid = new WindowAndroid(BlimpRendererActivity.this);
+        mBlimpClientSession =
+                new BlimpClientSession(PreferencesUtil.findAssignerUrl(this), mWindowAndroid);
         mBlimpClientSession.addObserver(this);
 
         mBlimpView = (BlimpView) findViewById(R.id.renderer);
@@ -167,9 +164,6 @@ public class BlimpRendererActivity
         mToolbar = (Toolbar) findViewById(R.id.toolbar);
         mToolbar.initialize(mBlimpClientSession, this);
 
-        mImeHelperDialog = new ImeHelperDialog(this);
-        mImeHelperDialog.initialize(mBlimpClientSession);
-
         mTabControlFeature = new TabControlFeature(mBlimpClientSession, mBlimpView);
 
         handleUrlFromIntent(getIntent());