Index: content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java |
index 3c8710a591b2db85dcf5336ca3b30f625940b09c..b35794f2f882720454313c9fff9b8ee9d8937342 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java |
@@ -18,14 +18,13 @@ import android.view.View; |
import android.view.inputmethod.BaseInputConnection; |
import android.view.inputmethod.EditorInfo; |
-import org.chromium.base.CommandLine; |
import org.chromium.base.Log; |
import org.chromium.base.VisibleForTesting; |
import org.chromium.base.annotations.CalledByNative; |
import org.chromium.base.annotations.JNINamespace; |
import org.chromium.blink_public.web.WebInputEventModifier; |
import org.chromium.blink_public.web.WebInputEventType; |
-import org.chromium.content.common.ContentSwitches; |
+import org.chromium.content.browser.ContentFeatureList; |
import org.chromium.ui.base.ime.TextInputType; |
import org.chromium.ui.picker.InputDialogContainer; |
@@ -121,7 +120,7 @@ public class ImeAdapter { |
} |
void resetInputConnectionFactory() { |
- if (shouldUseImeThread()) { |
+ if (ContentFeatureList.isEnabled(ContentFeatureList.IME_THREAD)) { |
mInputConnectionFactory = |
new ThreadedInputConnectionFactory(mInputMethodManagerWrapper); |
} else { |
@@ -129,16 +128,6 @@ public class ImeAdapter { |
} |
} |
- private boolean shouldUseImeThread() { |
- if (CommandLine.getInstance().hasSwitch(ContentSwitches.DISABLE_IME_THREAD)) { |
- return false; |
- } |
- if (CommandLine.getInstance().hasSwitch(ContentSwitches.ENABLE_IME_THREAD)) { |
- return true; |
- } |
- return false; |
- } |
- |
/** |
* @see View#onCreateInputConnection(EditorInfo) |
*/ |