| Index: content/browser/gamepad/platform_data_fetcher_linux.cc
|
| diff --git a/content/browser/gamepad/platform_data_fetcher_linux.cc b/content/browser/gamepad/platform_data_fetcher_linux.cc
|
| index ef65496b277f03b817acf7b8602e5c72e66370ce..a6abc0b471e7bc95b60cb612e4ce7a194ffa0831 100644
|
| --- a/content/browser/gamepad/platform_data_fetcher_linux.cc
|
| +++ b/content/browser/gamepad/platform_data_fetcher_linux.cc
|
| @@ -159,18 +159,12 @@ void GamepadPlatformDataFetcherLinux::RefreshDevice(udev_device* dev) {
|
|
|
| // Driver returns utf-8 strings here, so combine in utf-8 and then convert
|
| // to WebUChar to build the id string.
|
| - std::string id;
|
| - if (mapper) {
|
| - id = base::StringPrintf("%s %s (STANDARD GAMEPAD)",
|
| - manufacturer,
|
| - product);
|
| - } else {
|
| - id = base::StringPrintf("%s %s (Vendor: %s Product: %s)",
|
| + std::string id = base::StringPrintf("%s %s (%sVendor: %s Product: %s)",
|
| manufacturer,
|
| product,
|
| + mapper ? "STANDARD GAMEPAD " : "",
|
| vendor_id,
|
| product_id);
|
| - }
|
| TruncateUTF8ToByteSize(id, WebGamepad::idLengthCap - 1, &id);
|
| string16 tmp16 = UTF8ToUTF16(id);
|
| memset(pad.id, 0, sizeof(pad.id));
|
|
|