content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/

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 2081583002: Migrating majority of gamepad from content/browser/ to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Final tweaks Created 4 years, 5 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/BUILD.gn ('k') | content/public/android/java/src/org/chromium/content/browser/input/GamepadDevice.java » ('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 33c34fa82a9dc3e40d7331c7c7340a6074d4faa7..561c165b60f2c86a6f85b863d47b8af4410740b7 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

@@ -66,7 +66,6 @@ import org.chromium.content.browser.accessibility.captioning.SystemCaptioningBri

import org.chromium.content.browser.accessibility.captioning.TextTrackSettings;

import org.chromium.content.browser.input.AnimationIntervalProvider;

import org.chromium.content.browser.input.FloatingPastePopupMenu;

-import org.chromium.content.browser.input.GamepadList;

import org.chromium.content.browser.input.ImeAdapter;

import org.chromium.content.browser.input.InputMethodManagerWrapper;

import org.chromium.content.browser.input.JoystickScrollProvider;

@@ -84,6 +83,7 @@ import org.chromium.content_public.browser.AccessibilitySnapshotNode;

import org.chromium.content_public.browser.GestureStateListener;

import org.chromium.content_public.browser.WebContents;

import org.chromium.content_public.browser.WebContentsObserver;

+import org.chromium.device.gamepad.GamepadList;

import org.chromium.ui.base.DeviceFormFactor;

import org.chromium.ui.base.ViewAndroidDelegate;

import org.chromium.ui.base.WindowAndroid;