| Index: content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
|
| diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
|
| index 8ed59ac43960e2aaa6e04c5c9c2fe259510c77c5..69d0c63e31d4c974c131eafd0f7ef62f0a2e03ce 100644
|
| --- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
|
| +++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
|
| @@ -14,8 +14,8 @@
|
| #import <Foundation/Foundation.h>
|
| #include <IOKit/hid/IOHIDKeys.h>
|
|
|
| -using WebKit::WebGamepad;
|
| -using WebKit::WebGamepads;
|
| +using blink::WebGamepad;
|
| +using blink::WebGamepads;
|
|
|
| namespace content {
|
|
|
| @@ -266,7 +266,7 @@ void GamepadPlatformDataFetcherMac::DeviceAdd(IOHIDDeviceRef device) {
|
| const size_t kOutputLengthBytes = sizeof(data_.items[slot].id);
|
| memset(&data_.items[slot].id, 0, kOutputLengthBytes);
|
| [as16 getBytes:data_.items[slot].id
|
| - length:kOutputLengthBytes - sizeof(WebKit::WebUChar)];
|
| + length:kOutputLengthBytes - sizeof(blink::WebUChar)];
|
|
|
| base::ScopedCFTypeRef<CFArrayRef> elements(
|
| IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone));
|
| @@ -359,7 +359,7 @@ void GamepadPlatformDataFetcherMac::XboxDeviceAdd(XboxController* device) {
|
| const size_t kOutputLengthBytes = sizeof(data_.items[slot].id);
|
| memset(&data_.items[slot].id, 0, kOutputLengthBytes);
|
| [as16 getBytes:data_.items[slot].id
|
| - length:kOutputLengthBytes - sizeof(WebKit::WebUChar)];
|
| + length:kOutputLengthBytes - sizeof(blink::WebUChar)];
|
|
|
| associated_[slot].is_xbox = true;
|
| associated_[slot].xbox.device = device;
|
|
|