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

Unified Diff: device/bluetooth/bluetooth_adapter.cc

Issue 1898643002: Refactor device::BluetoothGattXXX classes to split into remote/local. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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_adapter.h ('k') | device/bluetooth/bluetooth_adapter_bluez.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter.cc
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index ebd1e2e9660e0ccc604a32afa55050f1af6f009d..6153a12d05a53fd9d1da2685feeac66c63c8c6f2 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -14,9 +14,9 @@
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_discovery_session.h"
#include "device/bluetooth/bluetooth_discovery_session_outcome.h"
-#include "device/bluetooth/bluetooth_gatt_characteristic.h"
-#include "device/bluetooth/bluetooth_gatt_descriptor.h"
-#include "device/bluetooth/bluetooth_gatt_service.h"
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
+#include "device/bluetooth/bluetooth_remote_gatt_service.h"
namespace device {
@@ -172,21 +172,24 @@ void BluetoothAdapter::NotifyDevicePairedChanged(BluetoothDevice* device,
}
#endif
-void BluetoothAdapter::NotifyGattServiceAdded(BluetoothGattService* service) {
+void BluetoothAdapter::NotifyGattServiceAdded(
+ BluetoothRemoteGattService* service) {
DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
GattServiceAdded(this, service->GetDevice(), service));
}
-void BluetoothAdapter::NotifyGattServiceRemoved(BluetoothGattService* service) {
+void BluetoothAdapter::NotifyGattServiceRemoved(
+ BluetoothRemoteGattService* service) {
DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
GattServiceRemoved(this, service->GetDevice(), service));
}
-void BluetoothAdapter::NotifyGattServiceChanged(BluetoothGattService* service) {
+void BluetoothAdapter::NotifyGattServiceChanged(
+ BluetoothRemoteGattService* service) {
DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
@@ -201,7 +204,7 @@ void BluetoothAdapter::NotifyGattServicesDiscovered(BluetoothDevice* device) {
}
void BluetoothAdapter::NotifyGattDiscoveryComplete(
- BluetoothGattService* service) {
+ BluetoothRemoteGattService* service) {
DCHECK_EQ(service->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
@@ -209,7 +212,7 @@ void BluetoothAdapter::NotifyGattDiscoveryComplete(
}
void BluetoothAdapter::NotifyGattCharacteristicAdded(
- BluetoothGattCharacteristic* characteristic) {
+ BluetoothRemoteGattCharacteristic* characteristic) {
DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
@@ -217,7 +220,7 @@ void BluetoothAdapter::NotifyGattCharacteristicAdded(
}
void BluetoothAdapter::NotifyGattCharacteristicRemoved(
- BluetoothGattCharacteristic* characteristic) {
+ BluetoothRemoteGattCharacteristic* characteristic) {
DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
@@ -225,7 +228,7 @@ void BluetoothAdapter::NotifyGattCharacteristicRemoved(
}
void BluetoothAdapter::NotifyGattDescriptorAdded(
- BluetoothGattDescriptor* descriptor) {
+ BluetoothRemoteGattDescriptor* descriptor) {
DCHECK_EQ(
descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
this);
@@ -235,7 +238,7 @@ void BluetoothAdapter::NotifyGattDescriptorAdded(
}
void BluetoothAdapter::NotifyGattDescriptorRemoved(
- BluetoothGattDescriptor* descriptor) {
+ BluetoothRemoteGattDescriptor* descriptor) {
DCHECK_EQ(
descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
this);
@@ -245,7 +248,7 @@ void BluetoothAdapter::NotifyGattDescriptorRemoved(
}
void BluetoothAdapter::NotifyGattCharacteristicValueChanged(
- BluetoothGattCharacteristic* characteristic,
+ BluetoothRemoteGattCharacteristic* characteristic,
const std::vector<uint8_t>& value) {
DCHECK_EQ(characteristic->GetService()->GetDevice()->GetAdapter(), this);
@@ -255,7 +258,7 @@ void BluetoothAdapter::NotifyGattCharacteristicValueChanged(
}
void BluetoothAdapter::NotifyGattDescriptorValueChanged(
- BluetoothGattDescriptor* descriptor,
+ BluetoothRemoteGattDescriptor* descriptor,
const std::vector<uint8_t>& value) {
DCHECK_EQ(
descriptor->GetCharacteristic()->GetService()->GetDevice()->GetAdapter(),
« no previous file with comments | « device/bluetooth/bluetooth_adapter.h ('k') | device/bluetooth/bluetooth_adapter_bluez.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698