content/browser/bluetooth/bluetooth_dispatcher_host.h - Issue 1527853002: bluetooth: Add disconnect function

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: content/browser/bluetooth/bluetooth_dispatcher_host.h

Issue 1527853002: bluetooth: Add disconnect function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-device-identifier

Patch Set: Merge Created 4 years, 11 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

« content/browser/bluetooth/bluetooth_allowed_devices_map.h ('K') | « content/browser/bluetooth/bluetooth_allowed_devices_map.cc ('k') | content/browser/bluetooth/bluetooth_dispatcher_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/bluetooth/bluetooth_dispatcher_host.h

diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.h b/content/browser/bluetooth/bluetooth_dispatcher_host.h

index b96ed3fb4ca159e329b8a923216c3b28b27fcb27..b3bb5152fc4ed43dd30ce4ced3a2ba92311ec1ee 100644

--- a/content/browser/bluetooth/bluetooth_dispatcher_host.h

+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.h

@@ -107,6 +107,9 @@ class CONTENT_EXPORT BluetoothDispatcherHost final

int request_id,

int frame_routing_id,

const std::string& device_id);

+ void OnDisconnect(int thread_id,

+ int frame_routing_id,

+ const std::string& device_id);

void OnGetPrimaryService(int thread_id,

int request_id,

int frame_routing_id,

@@ -304,8 +307,8 @@ class CONTENT_EXPORT BluetoothDispatcherHost final

base::Timer discovery_session_timer_;

// Retain BluetoothGattConnection objects to keep connections open.

- // TODO(scheib): Destroy as connections are closed. http://crbug.com/539643

- ScopedVector<device::BluetoothGattConnection> connections_;

+ std::map<std::string, scoped_ptr<device::BluetoothGattConnection>>

+ device_id_to_connection_map_;

// Keeps track of which devices have had their services discovered.

std::set<std::string> devices_with_discovered_services_;