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

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

Issue 2827263006: Revert "Refactor ContentViewClient (6/6)" (Closed)
Patch Set: Revert "Let ImeAdapterAndroid have the same lifecycle as its Java peer" Created 3 years, 8 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
Index: content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
index 0012b5b1b0150d4da1713f251df91ffd5c2177a9..987c433aa5fc0843b43244d18a2bd2bed2de423e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java
@@ -31,6 +31,7 @@ import org.chromium.base.VisibleForTesting;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.content.R;
import org.chromium.content.browser.input.FloatingPastePopupMenu;
+import org.chromium.content.browser.input.ImeAdapter;
import org.chromium.content.browser.input.LGEmailActionModeWorkaround;
import org.chromium.content.browser.input.LegacyPastePopupMenu;
import org.chromium.content.browser.input.PastePopupMenu;
@@ -82,6 +83,7 @@ public class SelectionPopupController extends ActionModeCallbackHelper {
private final WindowAndroid mWindowAndroid;
private final WebContents mWebContents;
private final RenderCoordinates mRenderCoordinates;
+ private final ImeAdapter mImeAdapter;
private ActionMode.Callback mCallback;
// Selection rectangle in DIP.
@@ -138,14 +140,16 @@ public class SelectionPopupController extends ActionModeCallbackHelper {
* @param webContents WebContents instance.
* @param view Container view.
* @param renderCoordinates Coordinates info used to position elements.
+ * @param imeAdapter ImeAdapter instance to handle cursor position.
*/
public SelectionPopupController(Context context, WindowAndroid window, WebContents webContents,
- View view, RenderCoordinates renderCoordinates) {
+ View view, RenderCoordinates renderCoordinates, ImeAdapter imeAdapter) {
mContext = context;
mWindowAndroid = window;
mWebContents = webContents;
mView = view;
mRenderCoordinates = renderCoordinates;
+ mImeAdapter = imeAdapter;
// The menu items are allowed by default.
mAllowedMenuItems = MENU_ITEM_SHARE | MENU_ITEM_WEB_SEARCH | MENU_ITEM_PROCESS_TEXT;

Powered by Google App Engine
This is Rietveld 408576698