device/bluetooth/bluez/bluetooth_gatt_service_bluez.h - Issue 1915803002: Bluetooth class changes for implementing local GATT attributes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1915803002: Bluetooth class changes for implementing local GATT attributes. (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/bluez/bluetooth_gatt_characteristic_bluez.cc ('k') | device/bluetooth/bluez/bluetooth_gatt_service_bluez.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluez/bluetooth_gatt_service_bluez.h

diff --git a/device/bluetooth/bluez/bluetooth_gatt_service_bluez.h b/device/bluetooth/bluez/bluetooth_gatt_service_bluez.h

index 45932d09d3130ca105edd8a6744ec8609acc8668..f907f58f6e35a6a5e27ba106889b7ec5838f4914 100644

--- a/device/bluetooth/bluez/bluetooth_gatt_service_bluez.h

+++ b/device/bluetooth/bluez/bluetooth_gatt_service_bluez.h

@@ -5,9 +5,7 @@

#ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_GATT_SERVICE_BLUEZ_H_

#define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_GATT_SERVICE_BLUEZ_H_

-#include <map>

#include <string>

-#include <vector>

#include "base/macros.h"

#include "dbus/object_path.h"

@@ -36,12 +34,10 @@ class BluetoothGattServiceBlueZ : public virtual device::BluetoothGattService {

BluetoothAdapterBlueZ* GetAdapter() const;

protected:

- explicit BluetoothGattServiceBlueZ(BluetoothAdapterBlueZ* adapter);

+ BluetoothGattServiceBlueZ(BluetoothAdapterBlueZ* adapter,

+ dbus::ObjectPath object_path);

~BluetoothGattServiceBlueZ() override;

- // Object path of the GATT service.

- dbus::ObjectPath object_path_;

private:

friend class BluetoothDeviceBlueZ;

@@ -49,6 +45,9 @@ class BluetoothGattServiceBlueZ : public virtual device::BluetoothGattService {

// here since |adapter_| indirectly owns this instance.

BluetoothAdapterBlueZ* adapter_;

+ // Object path of the GATT service.

+ dbus::ObjectPath object_path_;

DISALLOW_COPY_AND_ASSIGN(BluetoothGattServiceBlueZ);

};