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

Unified Diff: device/bluetooth/bluetooth_device_chromeos.h

Issue 735893002: Add GetConnectionInfo function for BluetoothDevice, replacing the existing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile errors on other platforms Created 5 years, 11 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.cc ('k') | device/bluetooth/bluetooth_device_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_device_chromeos.h
diff --git a/device/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
index 8e91cd76588a6f64f1e7a28222854c8701725bc6..dd853552b1319038bac7faaa60cb03583340b1ff 100644
--- a/device/bluetooth/bluetooth_device_chromeos.h
+++ b/device/bluetooth/bluetooth_device_chromeos.h
@@ -39,9 +39,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
virtual uint16 GetVendorID() const override;
virtual uint16 GetProductID() const override;
virtual uint16 GetDeviceID() const override;
- virtual int GetRSSI() const override;
- virtual int GetCurrentHostTransmitPower() const override;
- virtual int GetMaximumHostTransmitPower() const override;
virtual bool IsPaired() const override;
virtual bool IsConnected() const override;
virtual bool IsConnectable() const override;
@@ -50,6 +47,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
virtual bool ExpectingPinCode() const override;
virtual bool ExpectingPasskey() const override;
virtual bool ExpectingConfirmation() const override;
+ void GetConnectionInfo(
+ const ConnectionInfoCallback& callback) override;
virtual void Connect(
device::BluetoothDevice::PairingDelegate* pairing_delegate,
const base::Closure& callback,
@@ -74,9 +73,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
virtual void CreateGattConnection(
const GattConnectionCallback& callback,
const ConnectErrorCallback& error_callback) override;
- virtual void StartConnectionMonitor(
- const base::Closure& callback,
- const ErrorCallback& error_callback) override;
// Creates a pairing object with the given delegate |pairing_delegate| and
// establishes it as the pairing context for this device. All pairing-related
@@ -112,6 +108,16 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
virtual void GattServiceAdded(const dbus::ObjectPath& object_path) override;
virtual void GattServiceRemoved(const dbus::ObjectPath& object_path) override;
+ // Called by dbus:: on completion of the D-Bus method call to get the
+ // connection attributes of the current connection to the device.
+ void OnGetConnInfo(const ConnectionInfoCallback& callback,
+ int16 rssi,
+ int16 transmit_power,
+ int16 max_transmit_power);
+ void OnGetConnInfoError(const ConnectionInfoCallback& callback,
+ const std::string& error_name,
+ const std::string& error_message);
+
// Internal method to initiate a connection to this device, and methods called
// by dbus:: on completion of the D-Bus method call.
void ConnectInternal(bool after_pairing,
@@ -159,13 +165,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceChromeOS
const std::string& error_name,
const std::string& error_message);
- // Called by dbus:: on completion of the D-Bus method call to start the
- // connection monitor.
- void OnStartConnectionMonitor(const base::Closure& callback);
- void OnStartConnectionMonitorError(const ErrorCallback& error_callback,
- const std::string& error_name,
- const std::string& error_message);
-
// The adapter that owns this device instance.
BluetoothAdapterChromeOS* adapter_;
« no previous file with comments | « device/bluetooth/bluetooth_device.cc ('k') | device/bluetooth/bluetooth_device_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698