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

Unified Diff: device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h

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: device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
diff --git a/device/bluetooth/bluetooth_local_gatt_service_bluez.h b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
similarity index 67%
rename from device/bluetooth/bluetooth_local_gatt_service_bluez.h
rename to device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
index ad2523aa4d0a1f142fd30ffe50acae21908d4b12..4f5b6718be8c5f8e861fb7a776ad631f2e115a2e 100644
--- a/device/bluetooth/bluetooth_local_gatt_service_bluez.h
+++ b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.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 DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
+#ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
#include <string>
@@ -11,14 +11,13 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "dbus/object_path.h"
-#include "device/bluetooth/bluetooth_gatt_service_bluez.h"
-#include "device/bluetooth/bluetooth_uuid.h"
+#include "device/bluetooth/bluetooth_local_gatt_service.h"
+#include "device/bluetooth/bluez/bluetooth_gatt_service_bluez.h"
namespace device {
class BluetoothAdapter;
class BluetoothDevice;
-class BluetoothGattCharacteristic;
} // namespace device
@@ -29,16 +28,11 @@ class BluetoothDeviceBlueZ;
// The BluetoothLocalGattServiceBlueZ class implements BluetootGattService
// for local GATT services for platforms that use BlueZ.
-class BluetoothLocalGattServiceBlueZ : public BluetoothGattServiceBlueZ {
+class BluetoothLocalGattServiceBlueZ
+ : public BluetoothGattServiceBlueZ,
+ public device::BluetoothLocalGattService {
public:
- // device::BluetoothGattService overrides.
- device::BluetoothUUID GetUUID() const override;
- bool IsLocal() const override;
- bool IsPrimary() const override;
- device::BluetoothDevice* GetDevice() const override;
- bool AddCharacteristic(
- device::BluetoothGattCharacteristic* characteristic) override;
- bool AddIncludedService(device::BluetoothGattService* service) override;
+ // device::BluetoothLocalGattService overrides.
void Register(const base::Closure& callback,
const ErrorCallback& error_callback) override;
void Unregister(const base::Closure& callback,
@@ -66,4 +60,4 @@ class BluetoothLocalGattServiceBlueZ : public BluetoothGattServiceBlueZ {
} // namespace bluez
-#endif // DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
+#endif // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_

Powered by Google App Engine
This is Rietveld 408576698