Updating Gamepad API to match latest spec

content/browser/gamepad/gamepad_platform_data_fetcher_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gamepad/gamepad_platform_data_fetcher_win.h"
 
 #include "base/debug/trace_event.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/windows_version.h"
 #include "content/common/gamepad_hardware_buffer.h"
@@ skipping 120 matching lines @@
       WebGamepad& pad = pads->items[pad_index];
       pad.connected = true;
       PadState& state = pad_state_[pad_index];
       state.status = RAWINPUT_CONNECTED;
       state.raw_input_handle = gamepad->handle;
 
       std::string vendor = base::StringPrintf("%04x", gamepad->vendor_id);
       std::string product = base::StringPrintf("%04x", gamepad->product_id);
       state.mapper = GetGamepadStandardMappingFunction(vendor, product);
 
+#ifdef ENABLE_NEW_GAMEPAD_API
+      swprintf(pad.id, WebGamepad::idLengthCap,
+        L"%ls (Vendor: %04x Product: %04x)",
+        gamepad->id, gamepad->vendor_id, gamepad->product_id);
+
+      if (state.mapper)
+        swprintf(pad.mapping, WebGamepad::mappingLengthCap, L"standard");
+      else
+        pad.mapping[0] = 0;
+#else
       swprintf(pad.id, WebGamepad::idLengthCap,
         L"%ls (%lsVendor: %04x Product: %04x)",
         gamepad->id, state.mapper ? L"STANDARD GAMEPAD " : L"",
         gamepad->vendor_id, gamepad->product_id);
+#endif
+
       pads->length++;
     }
   }
 }
 
 
 void GamepadPlatformDataFetcherWin::GetGamepadData(WebGamepads* pads,
                                                    bool devices_changed_hint) {
   TRACE_EVENT0("GAMEPAD", "GetGamepadData");
 
@@ skipping 39 matching lines @@
     WebGamepad* pad) const {
   DCHECK(pad);
   TRACE_EVENT1("GAMEPAD", "GetXInputPadConnectivity", "id", i);
   XINPUT_CAPABILITIES caps;
   DWORD res = xinput_get_capabilities_(i, XINPUT_FLAG_GAMEPAD, &caps);
   if (res == ERROR_DEVICE_NOT_CONNECTED) {
     pad->connected = false;
     return false;
   } else {
     pad->connected = true;
+#ifdef ENABLE_NEW_GAMEPAD_API
+    swprintf(pad->id, WebGamepad::idLengthCap, L"Xbox 360 Controller (XInput)");
+    swprintf(pad->mapping, WebGamepad::mappingLengthCap, L"standard");
+#else
     swprintf(pad->id,
              WebGamepad::idLengthCap,
              L"Xbox 360 Controller (XInput STANDARD %ls)",
              GamepadSubTypeName(caps.SubType));
+#endif
     return true;
   }
 }
 
 void GamepadPlatformDataFetcherWin::GetXInputPadData(
     int i,
     WebGamepad* pad) {
   XINPUT_STATE state;
   memset(&state, 0, sizeof(XINPUT_STATE));
   TRACE_EVENT_BEGIN1("GAMEPAD", "XInputGetState", "id", i);
@@ skipping 76 matching lines @@
     return false;
   xinput_get_state_ = reinterpret_cast<XInputGetStateFunc>(
       xinput_dll_.GetFunctionPointer("XInputGetState"));
   if (!xinput_get_state_)
     return false;
   xinput_enable_(true);
   return true;
 }
 
 }  // namespace content