| Index: device/bluetooth/bluetooth_adapter_android.h
|
| diff --git a/device/bluetooth/bluetooth_adapter_android.h b/device/bluetooth/bluetooth_adapter_android.h
|
| index 7ebb5055a8702e310ce4bb787c36bd7edc926d0b..1368f135d486512c4aae8b24d0c1fc660cd1f69a 100644
|
| --- a/device/bluetooth/bluetooth_adapter_android.h
|
| +++ b/device/bluetooth/bluetooth_adapter_android.h
|
| @@ -45,7 +45,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterAndroid final
|
| // to |bluetooth_adapter_wrapper|.
|
| static base::WeakPtr<BluetoothAdapterAndroid> Create(
|
| const base::android::JavaRef<jobject>&
|
| - bluetooth_adapter_wrapper); // Java Type: bluetoothAdapterWrapper
|
| + bluetooth_adapter_wrapper, // Java Type: BluetoothAdapterWrapper
|
| + const base::android::JavaRef<jobject>&
|
| + bluetooth_manager_wrapper); // Java Type: BluetoothManagerWrapper
|
|
|
| // Register C++ methods exposed to Java using JNI.
|
| static bool RegisterJNI(JNIEnv* env);
|
| @@ -67,6 +69,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterAndroid final
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) override;
|
| bool IsDiscovering() const override;
|
| + std::unordered_map<BluetoothDevice*, BluetoothDevice::UUIDSet>
|
| + RetrieveGattConnectedDevicesWithDiscoveryFilter(
|
| + const BluetoothDiscoveryFilter& discovery_filter) override;
|
| UUIDList GetUUIDs() const override;
|
| void CreateRfcommService(
|
| const BluetoothUUID& uuid,
|
| @@ -134,6 +139,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterAndroid final
|
| // Java object org.chromium.device.bluetooth.ChromeBluetoothAdapter.
|
| base::android::ScopedJavaGlobalRef<jobject> j_adapter_;
|
|
|
| + // Java object org.chromium.device.bluetooth.ChromeBluetoothManager.
|
| + base::android::ScopedJavaGlobalRef<jobject> j_manager_;
|
| +
|
| private:
|
| size_t num_discovery_sessions_ = 0;
|
|
|
|
|