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

Unified Diff: third_party/WebKit/public/blink.gyp

Issue 2019853002: bluetooth: Use WebBluetoothDeviceId instead of string (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-uuid-typemap
Patch Set: Rebase Created 4 years, 4 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
Index: third_party/WebKit/public/blink.gyp
diff --git a/third_party/WebKit/public/blink.gyp b/third_party/WebKit/public/blink.gyp
index 83edc751ed00ec698f1f160eb9aa5ebf51509f58..eb8fb5cc4d758ec5da76abb09e873d4187087e9a 100644
--- a/third_party/WebKit/public/blink.gyp
+++ b/third_party/WebKit/public/blink.gyp
@@ -36,7 +36,6 @@
'blink_mojo_sources': [
'platform/mime_registry.mojom',
'platform/modules/background_sync/background_sync.mojom',
- 'platform/modules/bluetooth/web_bluetooth.mojom',
'platform/modules/broadcastchannel/broadcast_channel.mojom',
'platform/modules/geolocation/geolocation.mojom',
'platform/modules/hyphenation/hyphenation.mojom',
@@ -123,6 +122,7 @@
'mojom_files': [
'<@(blink_mojo_sources)',
'<@(blink_android_mojo_sources)',
+ 'platform/modules/bluetooth/web_bluetooth.mojom',
],
'mojom_typemaps': [
'../Source/platform/mojo/SecurityOrigin.typemap',
@@ -172,7 +172,6 @@
'<@(blink_android_mojo_sources)',
],
'mojom_typemaps': [
- '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',
'<(DEPTH)/url/mojo/origin.typemap',
'<@(blink_typemap_sources)',
],
@@ -218,8 +217,8 @@
'mojo_bindings_mojom',
'new_wrapper_types_mojo_bindings_blink_mojom',
'new_wrapper_types_mojo_bindings_mojom',
- '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
+ '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
'<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
'<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
],

Powered by Google App Engine
This is Rietveld 408576698