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

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java

Issue 2740103006: Implement SmartText selection. (Closed)
Patch Set: Made ~ContextSelectionClient() public and inlined SelectionPopupControler.unhideActionMode() Created 3 years, 9 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
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
index ae53c847293e0d35ae3d7bb650375720b1a156a2..2ef1267db8addf9bbcac6eea8506d615842d4f92 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/PopupZoomerTest.java
@@ -13,6 +13,7 @@ import android.support.test.filters.SmallTest;
import android.view.MotionEvent;
import android.view.View;
+import org.chromium.base.ThreadUtils;
import org.chromium.base.test.util.Feature;
import org.chromium.content.browser.input.ImeAdapter;
import org.chromium.content.browser.input.TestImeAdapterDelegate;
@@ -78,15 +79,24 @@ public class PopupZoomerTest extends ContentShellTestBase {
@Override
public void setUp() throws Exception {
super.setUp();
- mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
- mContentViewCore = new ContentViewCore(getActivity(), "");
- ImeAdapter imeAdapter = new ImeAdapter(new TestInputMethodManagerWrapper(mContentViewCore),
- new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
- mContentViewCore.setSelectionPopupControllerForTesting(
- new SelectionPopupController(getActivity(), null, null, null,
- mContentViewCore.getRenderCoordinates(), imeAdapter));
- mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
- mContentViewCore.setImeAdapterForTest(imeAdapter);
+
+ final Context context = getActivity();
+
+ ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+ @Override
+ public void run() {
+ mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
+ mContentViewCore = new ContentViewCore(context, "");
+ ImeAdapter imeAdapter = new ImeAdapter(
+ new TestInputMethodManagerWrapper(mContentViewCore),
+ new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
+ mContentViewCore.setSelectionPopupControllerForTesting(
+ new SelectionPopupController(context, null, null, null,
+ mContentViewCore.getRenderCoordinates(), imeAdapter));
+ mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
+ mContentViewCore.setImeAdapterForTest(imeAdapter);
+ }
+ });
}
@SmallTest
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698