Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2481)

Unified Diff: content/renderer/bluetooth/web_bluetooth_impl.h

Issue 2157493003: Revert of bluetooth: Use WebBluetoothDeviceId instead of string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-uuid-typemap
Patch Set: Created 4 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/bluetooth/web_bluetooth_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/bluetooth/web_bluetooth_impl.h
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
index 00658ddf7c62c9213037f1d65bbd803ed46397f0..e1257d03999103932621bc5642de11f53259e8b7 100644
--- a/content/renderer/bluetooth/web_bluetooth_impl.h
+++ b/content/renderer/bluetooth/web_bluetooth_impl.h
@@ -16,7 +16,6 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "content/common/bluetooth/web_bluetooth_device_id.h"
#include "content/common/content_export.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h"
@@ -89,7 +88,7 @@
void RemoteCharacteristicValueChanged(
const mojo::String& characteristic_instance_id,
mojo::Array<uint8_t> value) override;
- void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
+ void GattServerDisconnected(const mojo::String& device_id) override;
// Callbacks for WebBluetoothService calls:
void OnRequestDeviceComplete(
@@ -143,9 +142,7 @@
// Map of device_ids to WebBluetoothDevices. Added in connect() and removed in
// disconnect(). This means a device may not actually be connected while in
// this map, but that it will definitely be removed when the page navigates.
- std::unordered_map<WebBluetoothDeviceId,
- blink::WebBluetoothDevice*,
- WebBluetoothDeviceIdHash>
+ std::unordered_map<std::string, blink::WebBluetoothDevice*>
connected_devices_;
// Binding associated with |web_bluetooth_service_|.
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/bluetooth/web_bluetooth_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698