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

Unified Diff: components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.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
Index: components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc
diff --git a/components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc b/components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc
index 7e233a7ed3ad407077e1c3d07203e0badc0ade73..abb7414205a668d9b3c4c52fd78775c0d193a0e2 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc
+++ b/components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.cc
@@ -7,13 +7,13 @@
#include "components/proximity_auth/logging/logging.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
-#include "device/bluetooth/bluetooth_gatt_characteristic.h"
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
#include "device/bluetooth/bluetooth_uuid.h"
using device::BluetoothAdapter;
using device::BluetoothDevice;
-using device::BluetoothGattCharacteristic;
-using device::BluetoothGattService;
+using device::BluetoothRemoteGattCharacteristic;
+using device::BluetoothRemoteGattService;
using device::BluetoothUUID;
namespace proximity_auth {
@@ -60,7 +60,7 @@ BluetoothLowEnergyCharacteristicsFinder::
void BluetoothLowEnergyCharacteristicsFinder::GattCharacteristicAdded(
BluetoothAdapter* adapter,
- BluetoothGattCharacteristic* characteristic) {
+ BluetoothRemoteGattCharacteristic* characteristic) {
PA_LOG(INFO) << "New char found: "
<< characteristic->GetUUID().canonical_value();
HandleCharacteristicUpdate(characteristic);
@@ -68,7 +68,7 @@ void BluetoothLowEnergyCharacteristicsFinder::GattCharacteristicAdded(
void BluetoothLowEnergyCharacteristicsFinder::GattDiscoveryCompleteForService(
BluetoothAdapter* adapter,
- BluetoothGattService* service) {
+ BluetoothRemoteGattService* service) {
if (service && service->GetUUID() == remote_service_.uuid) {
PA_LOG(INFO) << "All characteristics discovered for "
<< remote_service_.uuid.canonical_value();
@@ -87,14 +87,15 @@ void BluetoothLowEnergyCharacteristicsFinder::ScanRemoteCharacteristics(
const BluetoothUUID& service_uuid) {
PA_LOG(INFO) << "Scanning remote characteristics.";
if (device) {
- std::vector<BluetoothGattService*> services = device->GetGattServices();
+ std::vector<BluetoothRemoteGattService*> services =
+ device->GetGattServices();
PA_LOG(INFO) << device->GetAddress() << " has " << services.size()
<< " services.";
for (const auto& service : services) {
if (service->GetUUID() == service_uuid) {
// Right service found, now scaning its characteristics.
- std::vector<device::BluetoothGattCharacteristic*> characteristics =
- service->GetCharacteristics();
+ std::vector<device::BluetoothRemoteGattCharacteristic*>
+ characteristics = service->GetCharacteristics();
PA_LOG(INFO) << "Service " << service_uuid.canonical_value() << " has "
<< characteristics.size() << " characteristics.";
for (const auto& characteristic : characteristics) {
@@ -107,7 +108,7 @@ void BluetoothLowEnergyCharacteristicsFinder::ScanRemoteCharacteristics(
}
void BluetoothLowEnergyCharacteristicsFinder::HandleCharacteristicUpdate(
- BluetoothGattCharacteristic* characteristic) {
+ BluetoothRemoteGattCharacteristic* characteristic) {
UpdateCharacteristicsStatus(characteristic);
if (!to_peripheral_char_.id.empty() && !from_peripheral_char_.id.empty() &&
@@ -120,7 +121,7 @@ void BluetoothLowEnergyCharacteristicsFinder::HandleCharacteristicUpdate(
}
void BluetoothLowEnergyCharacteristicsFinder::UpdateCharacteristicsStatus(
- BluetoothGattCharacteristic* characteristic) {
+ BluetoothRemoteGattCharacteristic* characteristic) {
if (characteristic &&
characteristic->GetService()->GetUUID() == remote_service_.uuid) {
BluetoothUUID uuid = characteristic->GetUUID();
@@ -129,7 +130,7 @@ void BluetoothLowEnergyCharacteristicsFinder::UpdateCharacteristicsStatus(
if (from_peripheral_char_.uuid == uuid)
from_peripheral_char_.id = characteristic->GetIdentifier();
- BluetoothGattService* service = characteristic->GetService();
+ BluetoothRemoteGattService* service = characteristic->GetService();
remote_service_.id = service->GetIdentifier();
}
}

Powered by Google App Engine
This is Rietveld 408576698