Add bluetooth device type icons on MD 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>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/login_status.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/chromeos/bluetooth/bluetooth_observer.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/session/logout_button_observer.h"
 #include "ash/common/system/chromeos/shutdown_policy_observer.h"
 #include "ash/common/system/date/clock_observer.h"
 #include "ash/common/system/ime/ime_observer.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/update_observer.h"
 #include "ash/common/system/user/user_observer.h"
 #include "ash/common/system/volume_control_delegate.h"
 #include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 64 matching lines @@
 #include "device/bluetooth/bluetooth_device.h"
 #include "net/base/escape.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/ime/chromeos/extension_ime_util.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/chromeos/ime/input_method_menu_item.h"
 #include "ui/chromeos/ime/input_method_menu_manager.h"
+#include "ui/gfx/paint_vector_icon.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 29 matching lines @@
 }
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
 void BluetoothDeviceConnectError(
     device::BluetoothDevice::ConnectErrorCode error_code) {
 }
 
+const gfx::VectorIcon& GetBluetoothDeviceIcon(
+    device::BluetoothDevice::DeviceType device_type) {
+  switch (device_type) {
+    case device::BluetoothDevice::DEVICE_COMPUTER:
+      return ash::kSystemMenuComputerIcon;
+    case device::BluetoothDevice::DEVICE_PHONE:
+      return ash::kSystemMenuPhoneIcon;
+    case device::BluetoothDevice::DEVICE_AUDIO:
+    case device::BluetoothDevice::DEVICE_CAR_AUDIO:
+      return ash::kSystemMenuHeadsetIcon;
+    case device::BluetoothDevice::DEVICE_VIDEO:
+      return ash::kSystemMenuVideocamIcon;
+    case device::BluetoothDevice::DEVICE_JOYSTICK:
+    case device::BluetoothDevice::DEVICE_GAMEPAD:
+      return ash::kSystemMenuGamepadIcon;
+    case device::BluetoothDevice::DEVICE_KEYBOARD:
+    case device::BluetoothDevice::DEVICE_KEYBOARD_MOUSE_COMBO:
+      return ash::kSystemMenuKeyboardIcon;
+    case device::BluetoothDevice::DEVICE_TABLET:
+      return ash::kSystemMenuTabletIcon;
+    case device::BluetoothDevice::DEVICE_MOUSE:
+      return ash::kSystemMenuMouseIcon;
+    case device::BluetoothDevice::DEVICE_UNKNOWN:
+      LOG(WARNING) << "Unknown device type icon for Bluetooth was requested.";
+      break;
+    default:
+      break;

[oshima, 2016/10/04 21:00:59]

remove default:

[fukino, 2016/10/05 06:34:45]

Done in ash/common/system/chromeos/bluetooth/tray_bluetooth.cc.

+  }
+  return ash::kSystemMenuBluetoothIcon;
+}
+
 std::unique_ptr<ash::CastConfigDelegate> CreateCastConfigDelegate() {
   if (CastConfigDelegateMediaRouter::IsEnabled())
     return base::MakeUnique<CastConfigDelegateMediaRouter>();
   return base::MakeUnique<CastConfigDelegateChromeos>();
 }
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(
       ProfileManager::GetActiveUserProfile(), sub_page);
 }
@@ skipping 413 matching lines @@
   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->GetNameForDisplay();
     info.connected = device->IsConnected();
     info.connecting = device->IsConnecting();
     info.paired = device->IsPaired();
+    if (ash::MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      info.icon_image = gfx::CreateVectorIcon(
+          GetBluetoothDeviceIcon(device->GetDeviceType()), ash::kMenuIconColor);
+    }
     list->push_back(info);
   }
 }
 
 void SystemTrayDelegateChromeOS::BluetoothStartDiscovering() {
   if (GetBluetoothDiscovering()) {
     LOG(WARNING) << "Already have active Bluetooth device discovery session.";
     return;
   }
   VLOG(1) << "Requesting new Bluetooth device discovery session.";
@@ skipping 689 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos