Add Bluetooth device type icons on the device list in system tray.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <set>
@@ skipping 168 matching lines @@
   chrome::ShowSettingsSubPageForProfile(
       ProfileManager::GetActiveUserProfile(), sub_page);
 }
 
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
   UserAddingScreen::Get()->Start();
 }
 
+ash::BluetoothDeviceInfo::DeviceType GetBluetoothDeviceType(
+    const device::BluetoothDevice* device) {
+  switch (device->GetDeviceType()) {
+    case device::BluetoothDevice::DEVICE_COMPUTER:
+      return ash::BluetoothDeviceInfo::DEVICE_COMPUTER;
+    case device::BluetoothDevice::DEVICE_PHONE:
+      return ash::BluetoothDeviceInfo::DEVICE_PHONE;
+    case device::BluetoothDevice::DEVICE_MODEM:
+      return ash::BluetoothDeviceInfo::DEVICE_MODEM;
+    case device::BluetoothDevice::DEVICE_AUDIO:
+      return ash::BluetoothDeviceInfo::DEVICE_AUDIO;
+    case device::BluetoothDevice::DEVICE_CAR_AUDIO:
+      return ash::BluetoothDeviceInfo::DEVICE_CAR_AUDIO;
+    case device::BluetoothDevice::DEVICE_VIDEO:
+      return ash::BluetoothDeviceInfo::DEVICE_VIDEO;
+    case device::BluetoothDevice::DEVICE_PERIPHERAL:
+      return ash::BluetoothDeviceInfo::DEVICE_PERIPHERAL;
+    case device::BluetoothDevice::DEVICE_JOYSTICK:
+      return ash::BluetoothDeviceInfo::DEVICE_JOYSTICK;
+    case device::BluetoothDevice::DEVICE_GAMEPAD:
+      return ash::BluetoothDeviceInfo::DEVICE_GAMEPAD;
+    case device::BluetoothDevice::DEVICE_KEYBOARD:
+      return ash::BluetoothDeviceInfo::DEVICE_KEYBOARD;
+    case device::BluetoothDevice::DEVICE_MOUSE:
+      return ash::BluetoothDeviceInfo::DEVICE_MOUSE;
+    case device::BluetoothDevice::DEVICE_TABLET:
+      return ash::BluetoothDeviceInfo::DEVICE_TABLET;
+    case device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO:
+      return ash::BluetoothDeviceInfo::DEVICE_KEYBOARD_MOUSE_COMBO;
+    default:
+      return ash::BluetoothDeviceInfo::DEVICE_UNKNOWN;

[oshima, 2016/04/27 20:31:27]

ash can depends on /chromeos

What's the reason to define the same enum on ash and chromeos?

[jennyz, 2016/04/27 23:27:38]

ditto oshima's comment.

[fukino, 2016/04/28 00:02:26]

In the Patch Set 1 of this CL, I directly referred
device::BluetootyDevice::DeviceType in ash/system/tray/system_tray_delegate.h.
But I got following error in analyze step of try bots.
=================================
ERROR at //ash/system/tray/system_tray_delegate.h:19:11: Include not allowed.
#include "device/bluetooth/bluetooth_device.h"
          ^----------------------------------
It is not in any dependency of
  //ash:ash
The include file is in the target(s):
  //device/bluetooth:bluetooth
which should somehow be reachable.
=================================

And I misinterpreted it. I thought ash couldn't depend on
device/bluetooth/bluetooth_device.h...
Now I think I should have modified GN file. I'll try to fix it.

+  }
+}
+
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : user_profile_(NULL),
       clock_type_(base::GetHourClockType()),
       search_key_mapped_to_(input_method::kSearchKey),
       screen_locked_(false),
       have_session_start_time_(false),
       have_session_length_limit_(false),
       should_run_bluetooth_discovery_(false),
@@ skipping 421 matching lines @@
 
 void SystemTrayDelegateChromeOS::GetAvailableBluetoothDevices(
     ash::BluetoothDeviceList* list) {
   device::BluetoothAdapter::DeviceList devices =
       bluetooth_adapter_->GetDevices();
   for (size_t i = 0; i < devices.size(); ++i) {
     device::BluetoothDevice* device = devices[i];
     ash::BluetoothDeviceInfo info;
     info.address = device->GetAddress();
     info.display_name = device->GetName();
+    info.device_type = GetBluetoothDeviceType(device);
     info.connected = device->IsConnected();
     info.connecting = device->IsConnecting();
     info.paired = device->IsPaired();
     list->push_back(info);
   }
 }
 
 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
   if (GetBluetoothDiscovering()) {
     LOG(WARNING) << "Already have active Bluetooth device discovery session.";
@@ skipping 691 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos