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

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

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/tray/system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.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.cc
diff --git a/ash/system/tray/system_tray_delegate.cc b/ash/system/tray/system_tray_delegate.cc
index 92469dc0b28f7045cc09bf6b245dfc7f17238b2f..04b76d0d609341b0da4401ae64db1f24320f4dfe 100644
--- a/ash/system/tray/system_tray_delegate.cc
+++ b/ash/system/tray/system_tray_delegate.cc
@@ -16,12 +16,19 @@ NetworkIconInfo::NetworkIconInfo()
NetworkIconInfo::~NetworkIconInfo() {
}
+#if defined(OS_CHROMEOS)
BluetoothDeviceInfo::BluetoothDeviceInfo()
- : connected(false), connecting(false), paired(false) {
-}
+ : device_type(device::BluetoothDevice::DEVICE_UNKNOWN),
+ connected(false),
+ connecting(false),
+ paired(false) {}
+
+BluetoothDeviceInfo::BluetoothDeviceInfo(const BluetoothDeviceInfo& other) =
+ default;
BluetoothDeviceInfo::~BluetoothDeviceInfo() {
}
+#endif
IMEInfo::IMEInfo() : selected(false), third_party(false) {
}
« no previous file with comments | « ash/system/tray/system_tray_delegate.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698