content/child/bluetooth/bluetooth_dispatcher.cc - Issue 1228113004: Put the RenderFrame's ID into a per-frame WebBluetooth, and plumb that back to the browser.

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/child/bluetooth/bluetooth_dispatcher.cc

Issue 1228113004: Put the RenderFrame's ID into a per-frame WebBluetooth, and plumb that back to the browser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@store-request-device-state-in-dispatcher

Patch Set: Remove mention of frames from content/child. Created 5 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

« content/browser/bluetooth/bluetooth_dispatcher_host.cc ('K') | « content/child/bluetooth/bluetooth_dispatcher.h ('k') | content/child/bluetooth/web_bluetooth_impl.h » ('j') | content/common/bluetooth/bluetooth_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/bluetooth/bluetooth_dispatcher.cc

diff --git a/content/child/bluetooth/bluetooth_dispatcher.cc b/content/child/bluetooth/bluetooth_dispatcher.cc

index 82a047e16522db2429471e64f53aeb30c847e8aa..0ce9fbbbc21813216c310e4dee1017b44d90bd6c 100644

--- a/content/child/bluetooth/bluetooth_dispatcher.cc

+++ b/content/child/bluetooth/bluetooth_dispatcher.cc

@@ -149,6 +149,7 @@ void BluetoothDispatcher::OnMessageReceived(const IPC::Message& msg) {

}

void BluetoothDispatcher::requestDevice(

+ int routing_id,

const WebRequestDeviceOptions& options,

blink::WebBluetoothRequestDeviceCallbacks* callbacks) {

int request_id = pending_requests_.Add(callbacks);

@@ -169,8 +170,8 @@ void BluetoothDispatcher::requestDevice(

optional_services.push_back(device::BluetoothUUID(optional_service.utf8()));

}

- Send(new BluetoothHostMsg_RequestDevice(CurrentWorkerId(), request_id,

- filters, optional_services));

+ Send(new BluetoothHostMsg_RequestDevice(

+ CurrentWorkerId(), request_id, routing_id, filters, optional_services));

}

void BluetoothDispatcher::connectGATT(