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

Unified Diff: components/proximity_auth/ble/bluetooth_low_energy_connection.cc

Issue 2561203002: Migrate weave-related classes from proximity_auth/ble to cryptauth/ble. (Closed)
Patch Set: Created 4 years 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_connection.cc
diff --git a/components/proximity_auth/ble/bluetooth_low_energy_connection.cc b/components/proximity_auth/ble/bluetooth_low_energy_connection.cc
index cd1cb50ef220057755cc744c6274de30e6ee9182..dc78e400899a71ccc7a21c5d84cb7923dcdfb9c1 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_connection.cc
+++ b/components/proximity_auth/ble/bluetooth_low_energy_connection.cc
@@ -13,8 +13,8 @@
#include "base/task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
-#include "components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.h"
-#include "components/proximity_auth/ble/fake_wire_message.h"
+#include "components/cryptauth/ble/bluetooth_low_energy_characteristics_finder.h"
+#include "components/cryptauth/ble/fake_wire_message.h"
#include "components/proximity_auth/bluetooth_throttler.h"
#include "components/proximity_auth/connection_finder.h"
#include "components/proximity_auth/logging/logging.h"
@@ -357,21 +357,21 @@ void BluetoothLowEnergyConnection::OnGattConnectionCreated(
weak_ptr_factory_.GetWeakPtr())));
}
-BluetoothLowEnergyCharacteristicsFinder*
+cryptauth::BluetoothLowEnergyCharacteristicsFinder*
BluetoothLowEnergyConnection::CreateCharacteristicsFinder(
- const BluetoothLowEnergyCharacteristicsFinder::SuccessCallback&
+ const cryptauth::BluetoothLowEnergyCharacteristicsFinder::SuccessCallback&
success_callback,
- const BluetoothLowEnergyCharacteristicsFinder::ErrorCallback&
+ const cryptauth::BluetoothLowEnergyCharacteristicsFinder::ErrorCallback&
error_callback) {
- return new BluetoothLowEnergyCharacteristicsFinder(
+ return new cryptauth::BluetoothLowEnergyCharacteristicsFinder(
adapter_, GetRemoteDevice(), remote_service_, to_peripheral_char_,
from_peripheral_char_, success_callback, error_callback);
}
void BluetoothLowEnergyConnection::OnCharacteristicsFound(
- const RemoteAttribute& service,
- const RemoteAttribute& to_peripheral_char,
- const RemoteAttribute& from_peripheral_char) {
+ const cryptauth::RemoteAttribute& service,
+ const cryptauth::RemoteAttribute& to_peripheral_char,
+ const cryptauth::RemoteAttribute& from_peripheral_char) {
PA_LOG(INFO) << "Remote chacteristics found.";
PrintTimeElapsed();
@@ -385,8 +385,8 @@ void BluetoothLowEnergyConnection::OnCharacteristicsFound(
}
void BluetoothLowEnergyConnection::OnCharacteristicsFinderError(
- const RemoteAttribute& to_peripheral_char,
- const RemoteAttribute& from_peripheral_char) {
+ const cryptauth::RemoteAttribute& to_peripheral_char,
+ const cryptauth::RemoteAttribute& from_peripheral_char) {
DCHECK(sub_status() == SubStatus::WAITING_CHARACTERISTICS);
PA_LOG(WARNING) << "Connection error, missing characteristics for SmartLock "
"service.\n"

Powered by Google App Engine
This is Rietveld 408576698