Chromium Code Reviews| Index: content/browser/bluetooth/bluetooth_dispatcher_host.cc |
| diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.cc b/content/browser/bluetooth/bluetooth_dispatcher_host.cc |
| index 01806135e7fcf2fd3d0ff3ab5e7ad7c28bf9dc39..9451f96f2ff8facd812730010f4685b0fc3e04ca 100644 |
| --- a/content/browser/bluetooth/bluetooth_dispatcher_host.cc |
| +++ b/content/browser/bluetooth/bluetooth_dispatcher_host.cc |
| @@ -368,13 +368,11 @@ struct BluetoothDispatcherHost::RequestDeviceSession { |
| public: |
| RequestDeviceSession(int thread_id, |
| int request_id, |
| - int frame_routing_id, |
|
ncarter (slow)
2016/04/14 17:37:36
My understanding is that the bluetooth code is in
ortuno
2016/04/14 17:53:53
This is OK. We used to save the routing id so we c
|
| url::Origin origin, |
| const std::vector<BluetoothScanFilter>& filters, |
| const std::vector<BluetoothUUID>& optional_services) |
| : thread_id(thread_id), |
| request_id(request_id), |
| - frame_routing_id(frame_routing_id), |
| origin(origin), |
| filters(filters), |
| optional_services(optional_services) {} |
| @@ -401,7 +399,6 @@ struct BluetoothDispatcherHost::RequestDeviceSession { |
| const int thread_id; |
| const int request_id; |
| - const int frame_routing_id; |
| const url::Origin origin; |
| const std::vector<BluetoothScanFilter> filters; |
| const std::vector<BluetoothUUID> optional_services; |
| @@ -1260,9 +1257,9 @@ void BluetoothDispatcherHost::OnRequestDeviceImpl( |
| // Create storage for the information that backs the chooser, and show the |
| // chooser. |
| - RequestDeviceSession* const session = new RequestDeviceSession( |
| - thread_id, request_id, frame_routing_id, requesting_origin, filters, |
| - optional_services_blacklist_filtered); |
| + RequestDeviceSession* const session = |
| + new RequestDeviceSession(thread_id, request_id, requesting_origin, |
| + filters, optional_services_blacklist_filtered); |
| int chooser_id = request_device_sessions_.Add(session); |
| BluetoothChooser::EventHandler chooser_event_handler = |