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

Unified Diff: components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h

Issue 2561203002: Migrate weave-related classes from proximity_auth/ble to cryptauth/ble. (Closed)
Patch Set: Rebase. 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/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h
diff --git a/components/proximity_auth/ble/bluetooth_low_energy_weave_client_connection.h b/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h
similarity index 91%
rename from components/proximity_auth/ble/bluetooth_low_energy_weave_client_connection.h
rename to components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h
index 681fe3b14796ee5a4b4d1b5e81b8a0187f6e306e..1a66bf2391f83ed9c7a195923ca554eecbdec1b4 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_weave_client_connection.h
+++ b/components/cryptauth/ble/bluetooth_low_energy_weave_client_connection.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_
-#define COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_
+#ifndef COMPONENTS_CRYPTAUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_
+#define COMPONENTS_CRYPTAUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_
#include <stddef.h>
#include <stdint.h>
@@ -17,12 +17,13 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-#include "components/proximity_auth/ble/bluetooth_low_energy_characteristics_finder.h"
-#include "components/proximity_auth/ble/bluetooth_low_energy_weave_packet_generator.h"
-#include "components/proximity_auth/ble/bluetooth_low_energy_weave_packet_receiver.h"
-#include "components/proximity_auth/ble/fake_wire_message.h"
-#include "components/proximity_auth/ble/remote_attribute.h"
-#include "components/proximity_auth/connection.h"
+#include "components/cryptauth/ble/bluetooth_low_energy_characteristics_finder.h"
+#include "components/cryptauth/ble/bluetooth_low_energy_weave_packet_generator.h"
+#include "components/cryptauth/ble/bluetooth_low_energy_weave_packet_receiver.h"
+#include "components/cryptauth/ble/fake_wire_message.h"
+#include "components/cryptauth/ble/remote_attribute.h"
+#include "components/cryptauth/bluetooth_throttler.h"
+#include "components/cryptauth/connection.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_gatt_notify_session.h"
@@ -33,8 +34,7 @@ namespace base {
class TaskRunner;
}
-namespace proximity_auth {
-class BluetoothThrottler;
+namespace cryptauth {
namespace weave {
// Creates GATT connection on top of the BLE connection and act as a Client.
@@ -69,8 +69,8 @@ class BluetoothLowEnergyWeaveClientConnection
static Factory* factory_instance_;
};
- // The sub-state of a proximity_auth::BluetoothLowEnergyWeaveClientConnection
- // extends the IN_PROGRESS state of proximity_auth::Connection::Status.
+ // The sub-state of a cryptauth::BluetoothLowEnergyWeaveClientConnection
+ // extends the IN_PROGRESS state of cryptauth::Connection::Status.
enum SubStatus {
DISCONNECTED,
WAITING_GATT_CONNECTION,
@@ -96,7 +96,7 @@ class BluetoothLowEnergyWeaveClientConnection
~BluetoothLowEnergyWeaveClientConnection() override;
- // proximity_auth::Connection:
+ // namespace cryptauth::Connection:
void Connect() override;
void Disconnect() override;
std::string GetDeviceAddress() override;
@@ -118,7 +118,7 @@ class BluetoothLowEnergyWeaveClientConnection
const BluetoothLowEnergyCharacteristicsFinder::ErrorCallback&
error_callback);
- // proximity_auth::Connection:
+ // namespace cryptauth::Connection:
void SendMessageImpl(std::unique_ptr<WireMessage> message) override;
// device::BluetoothAdapter::Observer:
@@ -311,6 +311,6 @@ class BluetoothLowEnergyWeaveClientConnection
} // namespace weave
-} // namespace proximity_auth
+} // namespace cryptauth
-#endif // COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_
+#endif // COMPONENTS_CRYPTAUTH_BLE_BLUETOOTH_LOW_ENERGY_WEAVE_CLIENT_CONNECTION_H_

Powered by Google App Engine
This is Rietveld 408576698