Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1321)

Unified Diff: device/gamepad/gamepad_standard_mappings.h

Issue 2808093006: [Device Service] Move Gamepad Blink headers to be part of the Gamepad client library (Closed)
Patch Set: rebase and address comments Created 3 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
« no previous file with comments | « device/gamepad/gamepad_shared_buffer.cc ('k') | device/gamepad/gamepad_standard_mappings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/gamepad/gamepad_standard_mappings.h
diff --git a/device/gamepad/gamepad_standard_mappings.h b/device/gamepad/gamepad_standard_mappings.h
index b924533cdaab85b2e5deb110007e175556df1cf0..bb31cff25d57a9818d9d64abb2bd64597ae29837 100644
--- a/device/gamepad/gamepad_standard_mappings.h
+++ b/device/gamepad/gamepad_standard_mappings.h
@@ -6,13 +6,12 @@
#define DEVICE_GAMEPAD_GAMEPAD_STANDARD_MAPPINGS_H_
#include "base/strings/string_piece.h"
-#include "third_party/WebKit/public/platform/WebGamepad.h"
+#include "device/gamepad/public/cpp/gamepad.h"
namespace device {
-typedef void (*GamepadStandardMappingFunction)(
- const blink::WebGamepad& original,
- blink::WebGamepad* mapped);
+typedef void (*GamepadStandardMappingFunction)(const Gamepad& original,
+ Gamepad* mapped);
GamepadStandardMappingFunction GetGamepadStandardMappingFunction(
const base::StringPiece& vendor_id,
@@ -63,13 +62,12 @@ enum CanonicalAxisIndex {
const float kDefaultButtonPressedThreshold = 30.f / 255.f;
// Common mapping functions
-blink::WebGamepadButton AxisToButton(float input);
-blink::WebGamepadButton AxisNegativeAsButton(float input);
-blink::WebGamepadButton AxisPositiveAsButton(float input);
-blink::WebGamepadButton ButtonFromButtonAndAxis(blink::WebGamepadButton button,
- float axis);
-blink::WebGamepadButton NullButton();
-void DpadFromAxis(blink::WebGamepad* mapped, float dir);
+GamepadButton AxisToButton(float input);
+GamepadButton AxisNegativeAsButton(float input);
+GamepadButton AxisPositiveAsButton(float input);
+GamepadButton ButtonFromButtonAndAxis(GamepadButton button, float axis);
+GamepadButton NullButton();
+void DpadFromAxis(Gamepad* mapped, float dir);
} // namespace device
« no previous file with comments | « device/gamepad/gamepad_shared_buffer.cc ('k') | device/gamepad/gamepad_standard_mappings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698