| Index: ash/system/tray/system_tray_delegate.h
|
| diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
|
| index 285dafb8c7e4787d58d1b7e72af8a2f3339b65a2..2251099477201dc6c55a26ba7d7faec164b2b46f 100644
|
| --- a/ash/system/tray/system_tray_delegate.h
|
| +++ b/ash/system/tray/system_tray_delegate.h
|
| @@ -47,11 +47,30 @@ struct ASH_EXPORT NetworkIconInfo {
|
| };
|
|
|
| struct ASH_EXPORT BluetoothDeviceInfo {
|
| + enum DeviceType {
|
| + DEVICE_UNKNOWN,
|
| + DEVICE_COMPUTER,
|
| + DEVICE_PHONE,
|
| + DEVICE_MODEM,
|
| + DEVICE_AUDIO,
|
| + DEVICE_CAR_AUDIO,
|
| + DEVICE_VIDEO,
|
| + DEVICE_PERIPHERAL,
|
| + DEVICE_JOYSTICK,
|
| + DEVICE_GAMEPAD,
|
| + DEVICE_KEYBOARD,
|
| + DEVICE_MOUSE,
|
| + DEVICE_TABLET,
|
| + DEVICE_KEYBOARD_MOUSE_COMBO,
|
| + };
|
| +
|
| BluetoothDeviceInfo();
|
| + BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
|
| ~BluetoothDeviceInfo();
|
|
|
| std::string address;
|
| base::string16 display_name;
|
| + DeviceType device_type;
|
| bool connected;
|
| bool connecting;
|
| bool paired;
|
|
|