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

Unified Diff: device/bluetooth/bluetooth_device_mac.mm

Issue 13416005: Bluetooth: clean up BluetoothDevice (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More win visible fixes Created 7 years, 9 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 | « device/bluetooth/bluetooth_device_mac.h ('k') | device/bluetooth/bluetooth_device_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device_mac.mm
diff --git a/device/bluetooth/bluetooth_device_mac.mm b/device/bluetooth/bluetooth_device_mac.mm
index 9669cfa30e240b4709d18685e21a1c8e18eced3e..df0b0af43c8da5b753db3c425f8f6fd01c437b6a 100644
--- a/device/bluetooth/bluetooth_device_mac.mm
+++ b/device/bluetooth/bluetooth_device_mac.mm
@@ -40,8 +40,7 @@ BluetoothDeviceMac::BluetoothDeviceMac(const IOBluetoothDevice* device)
address_ = base::SysNSStringToUTF8([device addressString]);
bluetooth_class_ = [device classOfDevice];
connected_ = [device isConnected];
- bonded_ = [device isPaired];
- visible_ = true;
+ paired_ = [device isPaired];
for (IOBluetoothSDPServiceRecord* service in [device services]) {
BluetoothServiceRecord* service_record =
@@ -54,11 +53,35 @@ BluetoothDeviceMac::BluetoothDeviceMac(const IOBluetoothDevice* device)
BluetoothDeviceMac::~BluetoothDeviceMac() {
}
+uint32 BluetoothDeviceMac::GetBluetoothClass() const {
+ return bluetooth_class_;
+}
+
+std::string BluetoothDeviceMac::GetDeviceName() const {
+ return name_;
+}
+
+std::string BluetoothDeviceMac::GetAddress() const {
+ return address_;
+}
+
bool BluetoothDeviceMac::IsPaired() const {
- return bonded_;
+ return paired_;
+}
+
+bool BluetoothDeviceMac::IsConnected() const {
+ return connected_;
+}
+
+bool BluetoothDeviceMac::IsConnectable() const {
+ return false;
+}
+
+bool BluetoothDeviceMac::IsConnecting() const {
+ return false;
}
-const BluetoothDevice::ServiceList& BluetoothDeviceMac::GetServices() const {
+BluetoothDevice::ServiceList BluetoothDeviceMac::GetServices() const {
return service_uuids_;
}
« no previous file with comments | « device/bluetooth/bluetooth_device_mac.h ('k') | device/bluetooth/bluetooth_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698