device/gamepad/gamepad_platform_data_fetcher_android.h - 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: device/gamepad/gamepad_platform_data_fetcher_android.h

Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Attempts at remaining platform fixes Created 4 years, 6 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_shared_buffer_impl.cc ('K') | « device/gamepad/gamepad_platform_data_fetcher.cc ('k') | device/gamepad/gamepad_platform_data_fetcher_android.cc » ('j') | device/gamepad/gamepad_shared_buffer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/gamepad/gamepad_platform_data_fetcher_android.h

diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_android.h b/device/gamepad/gamepad_platform_data_fetcher_android.h

similarity index 67%

rename from content/browser/gamepad/gamepad_platform_data_fetcher_android.h

rename to device/gamepad/gamepad_platform_data_fetcher_android.h

index c6ea2e37e1a3bec827b216094fb04c409a56530b..103841888cc78262565b5c5a0d6207925c0aedec 100644

--- a/content/browser/gamepad/gamepad_platform_data_fetcher_android.h

+++ b/device/gamepad/gamepad_platform_data_fetcher_android.h

@@ -5,19 +5,19 @@

// Define the data fetcher that GamepadProvider will use for android port.

// (GamepadPlatformDataFetcher).

-#ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_

-#define CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_

+#ifndef DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_

+#define DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_

#include <jni.h>

#include "base/android/jni_android.h"

#include "base/macros.h"

-#include "content/browser/gamepad/gamepad_data_fetcher.h"

-#include "content/browser/gamepad/gamepad_provider.h"

-#include "content/browser/gamepad/gamepad_standard_mappings.h"

+#include "device/gamepad/gamepad_data_fetcher.h"

+#include "device/gamepad/gamepad_provider.h"

+#include "device/gamepad/gamepad_standard_mappings.h"

#include "third_party/WebKit/public/platform/WebGamepads.h"

-namespace content {

+namespace device {

class GamepadPlatformDataFetcherAndroid : public GamepadDataFetcher {

public:

@@ -36,6 +36,6 @@ class GamepadPlatformDataFetcherAndroid : public GamepadDataFetcher {

DISALLOW_COPY_AND_ASSIGN(GamepadPlatformDataFetcherAndroid);

};

-} // namespace content

+} // namespace device

-#endif // CONTENT_BROWSER_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_

+#endif // DEVICE_GAMEPAD_GAMEPAD_PLATFORM_DATA_FETCHER_ANDROID_H_