| Index: device/gamepad/gamepad_data_fetcher.h
|
| diff --git a/content/browser/gamepad/gamepad_data_fetcher.h b/device/gamepad/gamepad_data_fetcher.h
|
| similarity index 76%
|
| rename from content/browser/gamepad/gamepad_data_fetcher.h
|
| rename to device/gamepad/gamepad_data_fetcher.h
|
| index a395fd9b0d20a931090b6a5feefbc285975465e2..28b3949a41f2325028bc6cfc75d9e55523ec5cac 100644
|
| --- a/content/browser/gamepad/gamepad_data_fetcher.h
|
| +++ b/device/gamepad/gamepad_data_fetcher.h
|
| @@ -2,16 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
| -#define CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
| +#ifndef DEVICE_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
| +#define DEVICE_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
|
|
| #include <stdint.h>
|
|
|
| +#include <limits>
|
| +
|
| #include "build/build_config.h"
|
| -#include "content/browser/gamepad/gamepad_standard_mappings.h"
|
| +#include "device/gamepad/gamepad_standard_mappings.h"
|
| #include "third_party/WebKit/public/platform/WebGamepads.h"
|
|
|
| -namespace content {
|
| +namespace device {
|
|
|
| // Abstract interface for imlementing platform- (and test-) specific behaviro
|
| // for getting the gamepad data.
|
| @@ -38,14 +40,14 @@ class GamepadDataFetcher {
|
|
|
| // If we ever increase the max axis count this will need to be updated.
|
| static_assert(blink::WebGamepad::axesLengthCap <=
|
| - std::numeric_limits<uint32_t>::digits,
|
| - "axis_mask is not large enough");
|
| + std::numeric_limits<uint32_t>::digits,
|
| + "axis_mask is not large enough");
|
| uint32_t axis_mask;
|
|
|
| // If we ever increase the max button count this will need to be updated.
|
| static_assert(blink::WebGamepad::buttonsLengthCap <=
|
| - std::numeric_limits<uint32_t>::digits,
|
| - "button_mask is not large enough");
|
| + std::numeric_limits<uint32_t>::digits,
|
| + "button_mask is not large enough");
|
| uint32_t button_mask;
|
| };
|
|
|
| @@ -56,6 +58,6 @@ class GamepadDataFetcher {
|
| #endif
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace device
|
|
|
| -#endif // CONTENT_BROWSER_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
| +#endif // DEVICE_GAMEPAD_GAMEPAD_DATA_FETCHER_H_
|
|
|