Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
index cea213c0974eb4320c782560b6865addd29b3c33..8b277ad4df0315ca79adf74d5976dc4ef0cd21d9 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
@@ -59,6 +59,7 @@ import org.chromium.content.browser.ScreenOrientationListener.ScreenOrientationO |
import org.chromium.content.browser.accessibility.AccessibilityInjector; |
import org.chromium.content.browser.accessibility.BrowserAccessibilityManager; |
import org.chromium.content.browser.input.AdapterInputConnection; |
+import org.chromium.content.browser.input.GamepadAdapter; |
import org.chromium.content.browser.input.HandleView; |
import org.chromium.content.browser.input.ImeAdapter; |
import org.chromium.content.browser.input.ImeAdapter.AdapterInputConnectionFactory; |
@@ -1455,6 +1456,7 @@ public class ContentViewCore |
setAccessibilityState(mAccessibilityManager.isEnabled()); |
ScreenOrientationListener.getInstance().addObserver(this, mContext); |
+ GamepadAdapter.onAttachedToWindow(mContext); |
} |
/** |
@@ -1469,6 +1471,7 @@ public class ContentViewCore |
unregisterAccessibilityContentObserver(); |
ScreenOrientationListener.getInstance().removeObserver(this); |
+ GamepadAdapter.onDetachedFromWindow(); |
} |
/** |
@@ -1700,6 +1703,8 @@ public class ContentViewCore |
return mContainerViewInternals.super_dispatchKeyEvent(event); |
} |
+ if (GamepadAdapter.onKeyEvent(event)) return true; |
+ |
if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER) { |
showImeIfNeeded(); |
// Event is not consumed here, because ImeAdapter might interpret |
@@ -1768,6 +1773,9 @@ public class ContentViewCore |
return true; |
} |
} |
+ |
+ if (GamepadAdapter.onMotionEvent(event)) return true; |
+ |
return mContainerViewInternals.super_onGenericMotionEvent(event); |
} |