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

Unified Diff: device/bluetooth/bluetooth_low_energy_win.h

Issue 395633003: Enumerate Bluetooth LE services and expose them to chrome.bluetooth API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix x64 build. Created 6 years, 5 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/bluetooth_low_energy_defs_win.cc ('k') | device/bluetooth/bluetooth_low_energy_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_low_energy_win.h
diff --git a/device/bluetooth/bluetooth_low_energy_win.h b/device/bluetooth/bluetooth_low_energy_win.h
index 6fb110756d3869d60aae49c20aa1d0b109319e61..46dd716c007ad93f3ab63b56da682d60b76ad446 100644
--- a/device/bluetooth/bluetooth_low_energy_win.h
+++ b/device/bluetooth/bluetooth_low_energy_win.h
@@ -5,44 +5,11 @@
#ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_WIN_H_
#define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_WIN_H_
-#include <windows.h>
-#include <setupapi.h>
-// #include <bthledef.h>
-// TODO(rpaquay):
-// bthledef.h from Win8 SDK has a couple of issues when used in a Win32 app:
-// * line 420: usage of "pragma pop" instead of "pragma warning(pop)"
-// * line 349: no CALLBACK modifier in the definition of
-// PFNBLUETOOTH_GATT_EVENT_CALLBACK.
-//
-// So, we duplicate the definitions we need and prevent the build from including
-// the content of bthledef.h.
-#ifndef __BTHLEDEF_H__
-#define __BTHLEDEF_H__
-
-//
-// Bluetooth LE device interface GUID
-//
-// {781aee18-7733-4ce4-adb0-91f41c67b592}
-DEFINE_GUID(GUID_BLUETOOTHLE_DEVICE_INTERFACE,
- 0x781aee18,
- 0x7733,
- 0x4ce4,
- 0xad,
- 0xd0,
- 0x91,
- 0xf4,
- 0x1c,
- 0x67,
- 0xb5,
- 0x92);
-
-#endif // __BTHLEDEF_H__
-#include <bluetoothapis.h>
-
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/win/scoped_handle.h"
+#include "device/bluetooth/bluetooth_low_energy_defs_win.h"
namespace device {
namespace win {
@@ -105,6 +72,13 @@ class DevicePropertyValue {
// Returns true only on Windows platforms supporting Bluetooth Low Energy.
bool IsBluetoothLowEnergySupported();
+struct BluetoothLowEnergyServiceInfo {
+ BluetoothLowEnergyServiceInfo();
+ ~BluetoothLowEnergyServiceInfo();
+
+ BTH_LE_UUID uuid;
+};
+
struct BluetoothLowEnergyDeviceInfo {
BluetoothLowEnergyDeviceInfo();
~BluetoothLowEnergyDeviceInfo();
@@ -127,6 +101,16 @@ bool EnumerateKnownBluetoothLowEnergyDevices(
ScopedVector<BluetoothLowEnergyDeviceInfo>* devices,
std::string* error);
+// Enumerates the list of known (i.e. cached) GATT services for a given
+// Bluetooth LE device |device_info| into |services|. In case of error, returns
+// false and sets |error| with an error message describing the problem. Note:
+// This function returns an error if Bluetooth Low Energy is not supported on
+// this Windows platform.
+bool EnumerateKnownBluetoothLowEnergyServices(
+ BluetoothLowEnergyDeviceInfo* device_info,
+ ScopedVector<BluetoothLowEnergyServiceInfo>* services,
+ std::string* error);
+
bool ExtractBluetoothAddressFromDeviceInstanceIdForTesting(
const std::string& instance_id,
BLUETOOTH_ADDRESS* btha,
« no previous file with comments | « device/bluetooth/bluetooth_low_energy_defs_win.cc ('k') | device/bluetooth/bluetooth_low_energy_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698