content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 133943002: Gamepad API support for chrome on android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 133943002: Gamepad API support for chrome on android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 6 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

« content/browser/gamepad/gamepad_platform_data_fetcher_android.h ('K') | « content/content_jni.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/input/CanonicalAxisIndex.template » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 2e8d56df7541aa7ac99a288fcb4175b669c4477b..b6700b0328726bf6efe0630fbf36e87ec715a6aa 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.GamepadList;

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);

+ GamepadList.onAttachedToWindow(mContext);

}

/**

@@ -1469,6 +1471,7 @@ public class ContentViewCore

unregisterAccessibilityContentObserver();

ScreenOrientationListener.getInstance().removeObserver(this);

+ GamepadList.onDetachedFromWindow();

}

/**

@@ -1696,6 +1699,7 @@ public class ContentViewCore

* @see View#dispatchKeyEvent(KeyEvent)

public boolean dispatchKeyEvent(KeyEvent event) {

+ if (GamepadList.dispatchKeyEvent(event)) return true;

if (getContentViewClient().shouldOverrideKeyEvent(event)) {

return mContainerViewInternals.super_dispatchKeyEvent(event);

}

@@ -1747,6 +1751,7 @@ public class ContentViewCore

* @see View#onGenericMotionEvent(MotionEvent)

public boolean onGenericMotionEvent(MotionEvent event) {

+ if (GamepadList.onGenericMotionEvent(event)) return true;

if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0) {

switch (event.getAction()) {

case MotionEvent.ACTION_SCROLL: