Add bluetooth device type icons on MD system tray.

ash/common/system/chromeos/bluetooth/tray_bluetooth.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 "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.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/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
+#include "device/bluetooth/bluetooth_common.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/toggle_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 namespace tray {
 namespace {
 
 // Updates bluetooth device |device| in the |list|. If it is new, append to the
@@ skipping 20 matching lines @@
   for (BluetoothDeviceList::iterator it = list->begin(); it != list->end();
        ++it) {
     if (new_list.find((*it).address) == new_list.end()) {
       it = list->erase(it);
       if (it == list->end())
         return;
     }
   }
 }
 
+// Returns corresponding device type icons for given Bluetooth device types.
+const gfx::VectorIcon& GetBluetoothDeviceIcon(
+    device::BluetoothDeviceType device_type) {
+  switch (device_type) {
+    case device::BluetoothDeviceType::COMPUTER:
+      return ash::kSystemMenuComputerIcon;
+    case device::BluetoothDeviceType::PHONE:
+      return ash::kSystemMenuPhoneIcon;
+    case device::BluetoothDeviceType::AUDIO:
+    case device::BluetoothDeviceType::CAR_AUDIO:
+      return ash::kSystemMenuHeadsetIcon;
+    case device::BluetoothDeviceType::VIDEO:
+      return ash::kSystemMenuVideocamIcon;
+    case device::BluetoothDeviceType::JOYSTICK:
+    case device::BluetoothDeviceType::GAMEPAD:
+      return ash::kSystemMenuGamepadIcon;
+    case device::BluetoothDeviceType::KEYBOARD:
+    case device::BluetoothDeviceType::KEYBOARD_MOUSE_COMBO:
+      return ash::kSystemMenuKeyboardIcon;
+    case device::BluetoothDeviceType::TABLET:
+      return ash::kSystemMenuTabletIcon;
+    case device::BluetoothDeviceType::MOUSE:
+      return ash::kSystemMenuMouseIcon;
+    case device::BluetoothDeviceType::MODEM:
+    case device::BluetoothDeviceType::PERIPHERAL:
+      return ash::kSystemMenuBluetoothIcon;
+    case device::BluetoothDeviceType::UNKNOWN:
+      LOG(WARNING) << "Unknown device type icon for Bluetooth was requested.";

[tdanderson, 2016/10/06 14:12:12]

Would a NOTREACHED() be more appropriate here?

[fukino, 2016/10/06 14:45:30]

I'm not sure if it is critical that a BT device is classified as UNKNOWN.
(Maybe it can occur when a new BT spec is added and Chrome is still not
updated?)

As the classification login in device/bluetooth doesn't treat it as an error, I
use WARNING here.
https://codesearch.chromium.org/chromium/src/device/bluetooth/bluetooth_devic...

[tdanderson, 2016/10/06 14:47:16]

OK, sg

+      break;
+  }
+  return ash::kSystemMenuBluetoothIcon;
+}
+
 }  // namespace
 
 class BluetoothDefaultView : public TrayItemMore {
  public:
   BluetoothDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
     if (!MaterialDesignController::IsSystemTrayMenuMaterial()) {
       // The icon doesn't change in non-md.
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       SetImage(
@@ skipping 145 matching lines @@
                                            new_connecting_devices);
     RemoveObsoleteBluetoothDevicesFromList(&connected_devices_,
                                            new_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&paired_not_connected_devices_,
                                            new_paired_not_connected_devices);
     RemoveObsoleteBluetoothDevicesFromList(&discovered_not_paired_devices_,
                                            new_discovered_not_paired_devices);
   }
 
   void UpdateHeaderEntry() {
-    if (toggle_bluetooth_) {
-      toggle_bluetooth_->SetToggled(
-          !WmShell::Get()->system_tray_delegate()->GetBluetoothEnabled());
-    }
+    bool is_bluetooth_enabled =
+        WmShell::Get()->system_tray_delegate()->GetBluetoothEnabled();
+    if (toggle_)
+      toggle_->SetIsOn(is_bluetooth_enabled, false);
+    else if (toggle_bluetooth_)
+      toggle_bluetooth_->SetToggled(!is_bluetooth_enabled);
   }
 
   void UpdateDeviceScrollList() {
     device_map_.clear();
     scroll_content()->RemoveAllChildViews(true);
     enable_bluetooth_ = nullptr;
 
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     bool bluetooth_enabled = delegate->GetBluetoothEnabled();
     bool blueooth_available = delegate->GetBluetoothAvailable();
@@ skipping 25 matching lines @@
     }
 
     scroll_content()->SizeToPreferredSize();
   }
 
   void AppendSameTypeDevicesToScrollList(const BluetoothDeviceList& list,
                                          bool highlight,
                                          bool checked,
                                          bool enabled) {
     for (size_t i = 0; i < list.size(); ++i) {
-      HoverHighlightView* container =
-          AddScrollListItem(list[i].display_name, highlight, checked, enabled);
+      HoverHighlightView* container = nullptr;
+      if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+        gfx::ImageSkia icon_image = CreateVectorIcon(
+            GetBluetoothDeviceIcon(list[i].device_type), ash::kMenuIconColor);

[tdanderson, 2016/10/06 14:12:12]

nit: ash:: not needed

[fukino, 2016/10/07 00:19:16]

Done.

+        container = AddScrollListItemWithIcon(list[i].display_name, highlight,
+                                              checked, enabled, icon_image);
+
+      } else {
+        container = AddScrollListItem(list[i].display_name, highlight, checked,
+                                      enabled);
+      }
       device_map_[container] = list[i].address;
     }
   }
 
+  // TODO(fukino): Remove this code when material design is enabled by default,
+  // since AddScrollListItem should be used only in the old design.
+  // See crbug.com/614453".
   HoverHighlightView* AddScrollListItem(const base::string16& text,
                                         bool highlight,
                                         bool checked,
                                         bool enabled) {
     HoverHighlightView* container = new HoverHighlightView(this);
     views::Label* label =
         container->AddCheckableLabel(text, highlight, checked);
     label->SetEnabled(enabled);
     scroll_content()->AddChildView(container);
     return container;
   }
 
+  HoverHighlightView* AddScrollListItemWithIcon(const base::string16& text,
+                                                bool highlight,
+                                                bool checked,
+                                                bool enabled,
+                                                const gfx::ImageSkia& image) {
+    HoverHighlightView* container = new HoverHighlightView(this);
+    const int padding = (kMenuButtonSize - image.width()) / 2;
+    container->AddIconAndLabelCustomSize(
+        image, text, highlight,
+        image.width() + kMenuSeparatorVerticalPadding * 2, padding, padding);
+    gfx::ImageSkia check_mark =
+        CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE, gfx::kGoogleGreen700);
+    container->AddRightIcon(check_mark, check_mark.width());
+    container->SetRightIconVisible(checked);
+    container->text_label()->SetEnabled(enabled);
+    scroll_content()->AddChildView(container);
+    return container;
+  }
+
   // Add settings entries.
   void AppendSettingsEntries() {
     if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings())
       return;
 
     // Add bluetooth device requires a browser window, hide it for non logged in
     // user.
     if (login_ == LoginStatus::NOT_LOGGED_IN || login_ == LoginStatus::LOCKED ||
         WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen()) {
       return;
@@ skipping 72 matching lines @@
     if (FoundDevice(device_id, connecting_devices_, nullptr))
       return;
 
     UpdateClickedDevice(device_id, view);
     delegate->ConnectToBluetoothDevice(device_id);
   }
 
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-      // TODO(fukino): Make the toggle button functional.
       if (sender == toggle_)
-        toggle_->SetIsOn(toggle_->is_on(), true);
+        WmShell::Get()->system_tray_delegate()->ToggleBluetooth();
+      else
+        NOTREACHED();
       return;
     }
 
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
     if (sender == toggle_bluetooth_)
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
@@ skipping 106 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash