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

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

Issue 2791603002: Revert of Let ImeAdapterAndroid have the same lifecycle as its Java peer (Closed)
Patch Set: 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/input/ImeAdapter.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 0a554c964b3d43f39cdd6f107e7ace6e7e5b7b6c..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
@@ -79,8 +79,6 @@
@Override
public void setUp() throws Exception {
super.setUp();
- mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
- mContentViewCore = new ContentViewCore(getActivity(), "");
final Context context = getActivity();
@@ -89,11 +87,12 @@
public void run() {
mPopupZoomer = createPopupZoomerForTest(getInstrumentation().getTargetContext());
mContentViewCore = new ContentViewCore(context, "");
- ImeAdapter imeAdapter = new ImeAdapter(getContentViewCore().getWebContents(),
+ ImeAdapter imeAdapter = new ImeAdapter(
new TestInputMethodManagerWrapper(mContentViewCore),
new TestImeAdapterDelegate(getContentViewCore().getContainerView()));
- mContentViewCore.setSelectionPopupControllerForTesting(new SelectionPopupController(
- context, null, null, null, mContentViewCore.getRenderCoordinates()));
+ mContentViewCore.setSelectionPopupControllerForTesting(
+ new SelectionPopupController(context, null, null, null,
+ mContentViewCore.getRenderCoordinates(), imeAdapter));
mContentViewCore.setPopupZoomerForTest(mPopupZoomer);
mContentViewCore.setImeAdapterForTest(imeAdapter);
}
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698