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 69d0c63e31d4c974c131eafd0f7ef62f0a2e03ce..f09fc83d3790d7b18f04478e51e7c1b073f9b668 100644 |
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm |
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm |
@@ -353,7 +353,10 @@ void GamepadPlatformDataFetcherMac::XboxDeviceAdd(XboxController* device) { |
NSString* ident = |
[NSString stringWithFormat: |
- @"Xbox 360 Controller (STANDARD GAMEPAD Vendor: %04x Product: %04x)", |
+ @"%@ (STANDARD GAMEPAD Vendor: %04x Product: %04x)", |
+ device->GetControllerType() == XboxController::XBOX_360_CONTROLLER |
+ ? @"Xbox 360 Controller" |
+ : @"Xbox One Controller", |
device->GetProductId(), device->GetVendorId()]; |
NSData* as16 = [ident dataUsingEncoding:NSUTF16StringEncoding]; |
const size_t kOutputLengthBytes = sizeof(data_.items[slot].id); |