bluetooth: enable gaming devices

chrome/browser/chromeos/bluetooth/bluetooth_device.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 "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 92 matching lines @@
         case 0x05:
           // Modems: wired or voice gateway and common ISDN access.
           return DEVICE_MODEM;
       }
       break;
     case 0x05:
       // Peripheral major device class.
       switch ((bluetooth_class_ & 0xc0) >> 6) {
         case 0x00:
           // "Not a keyboard or pointing device."
-          return DEVICE_PERIPHERAL;
+          switch ((bluetooth_class_ & 0x01e) >> 2) {
+            case 0x01:
+              // Joystick.
+              return DEVICE_JOYSTICK;
+            case 0x02:
+              // Gamepad.
+              return DEVICE_GAMEPAD;
+            default:
+              return DEVICE_PERIPHERAL;
+          }
+          break;
         case 0x01:
           // Keyboard.
           return DEVICE_KEYBOARD;
         case 0x02:
           // Pointing device.
           switch ((bluetooth_class_ & 0x01e) >> 2) {
             case 0x05:
               // Digitizer tablet.
               return DEVICE_TABLET;
             default:
               // Mouse.
               return DEVICE_MOUSE;
           }
           break;
         case 0x03:
           // Combo device.
           return DEVICE_KEYBOARD_MOUSE_COMBO;
       }
       break;
   }
 
   return DEVICE_UNKNOWN;
 }
 
 bool BluetoothDevice::IsSupported() const {
   DeviceType device_type = GetDeviceType();
-  return (device_type == DEVICE_KEYBOARD ||
+  return (device_type == DEVICE_JOYSTICK ||
+          device_type == DEVICE_GAMEPAD ||
+          device_type == DEVICE_KEYBOARD ||
           device_type == DEVICE_MOUSE ||
           device_type == DEVICE_TABLET ||
           device_type == DEVICE_KEYBOARD_MOUSE_COMBO);
 }
 
 string16 BluetoothDevice::GetAddressWithLocalizedDeviceTypeName() const {
   string16 address = UTF8ToUTF16(address_);
   DeviceType device_type = GetDeviceType();
   switch (device_type) {
     case DEVICE_COMPUTER:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_COMPUTER,
                                         address);
     case DEVICE_PHONE:
           return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_PHONE,
                                             address);
     case DEVICE_MODEM:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_MODEM,
                                         address);
+    case DEVICE_JOYSTICK:
+      return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_JOYSTICK,
+                                        address);
+    case DEVICE_GAMEPAD:
+      return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_GAMEPAD,
+                                        address);
     case DEVICE_KEYBOARD:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_KEYBOARD,
                                         address);
     case DEVICE_MOUSE:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_MOUSE,
                                         address);
     case DEVICE_TABLET:
       return l10n_util::GetStringFUTF16(IDS_BLUETOOTH_DEVICE_TABLET,
                                         address);
     case DEVICE_KEYBOARD_MOUSE_COMBO:
@@ skipping 457 matching lines @@
 // static
 BluetoothDevice* BluetoothDevice::CreateUnbound(
     BluetoothAdapter* adapter,
     const BluetoothDeviceClient::Properties* properties) {
   BluetoothDevice* device = new BluetoothDevice(adapter);
   device->Update(properties, false);
   return device;
 }
 
 }  // namespace chromeos