content/browser/bluetooth/web_bluetooth_service_impl.h - Issue 1898303003: bluetooth: Clean up WebBluetoothServiceImpl when adapter is removed

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/web_bluetooth_service_impl.h

Issue 1898303003: bluetooth: Clean up WebBluetoothServiceImpl when adapter is removed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Clean up 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

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

Index: content/browser/bluetooth/web_bluetooth_service_impl.h

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

index c8a8d81afcc9ac70806c4cb6b68417e487174151..e044254563de5e54bc8724e16b1bc001b42aa96e 100644

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

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

@@ -60,6 +60,8 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,

void DidFinishNavigation(NavigationHandle* navigation_handle) override;

// BluetoothAdapter::Observer:

+ void AdapterPresentChanged(device::BluetoothAdapter* adapter,

+ bool present) override;

void GattCharacteristicValueChanged(

device::BluetoothAdapter* adapter,

device::BluetoothGattCharacteristic* characteristic,

@@ -123,8 +125,8 @@ class WebBluetoothServiceImpl : public blink::mojom::WebBluetoothService,

void CrashRendererAndClosePipe(bad_message::BadMessageReason reason);

url::Origin GetOrigin();

- // All state (maps, sets, etc.) should be cleaned after navigations

- // that are not in the same page.

+ // Clears all state (maps, sets, etc).

+ void ClearState();

// Map to keep track of the characteristics' notify sessions.

std::unordered_map<std::string,