Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2759)

Unified Diff: ash/system/tray/system_tray_delegate.h

Issue 1931563002: Add Bluetooth device type icons on the device list in system tray. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase / Removes ash::BluetoothDeviceInfo::DeviceType and uses existing device::BluetoothDevice::De… Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/bluetooth/tray_bluetooth.cc ('k') | ash/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..632550d76a8aeb954355a54f5a505dcd24f4dc2e 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -18,6 +18,10 @@
#include "base/strings/string16.h"
#include "ui/gfx/image/image_skia.h"
+#if defined(OS_CHROMEOS)
+#include "device/bluetooth/bluetooth_device.h"
+#endif
+
class AccountId;
namespace base {
@@ -46,18 +50,22 @@ struct ASH_EXPORT NetworkIconInfo {
bool is_cellular;
};
+#if defined(OS_CHROMEOS)
struct ASH_EXPORT BluetoothDeviceInfo {
BluetoothDeviceInfo();
+ BluetoothDeviceInfo(const BluetoothDeviceInfo& other);
~BluetoothDeviceInfo();
std::string address;
base::string16 display_name;
+ device::BluetoothDevice::DeviceType device_type;
bool connected;
bool connecting;
bool paired;
};
using BluetoothDeviceList = std::vector<BluetoothDeviceInfo>;
+#endif
struct ASH_EXPORT IMEPropertyInfo {
IMEPropertyInfo();
« no previous file with comments | « ash/system/chromeos/bluetooth/tray_bluetooth.cc ('k') | ash/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698