third_party/WebKit/public/blink.gyp - Issue 2157493003: Revert of bluetooth: Use WebBluetoothDeviceId instead of string

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: third_party/WebKit/public/blink.gyp

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 | « mojo/public/tools/bindings/chromium_bindings_configuration.gni ('k') | third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/public/blink.gyp

diff --git a/third_party/WebKit/public/blink.gyp b/third_party/WebKit/public/blink.gyp

index 5f958c008ea9d7cc60a4cf5abad6bddcc158e2c2..7a44309465f4980c1a0c5b9d5beb2e344f9e7d30 100644

--- a/third_party/WebKit/public/blink.gyp

+++ b/third_party/WebKit/public/blink.gyp

@@ -36,6 +36,7 @@

'blink_mojo_sources': [

'platform/mime_registry.mojom',

'platform/modules/background_sync/background_sync.mojom',

+ 'platform/modules/bluetooth/web_bluetooth.mojom',

'platform/modules/geolocation/geolocation.mojom',

'platform/modules/notifications/notification.mojom',

'platform/modules/notifications/notification_service.mojom',

@@ -113,7 +114,6 @@

'mojom_files': [

'<@(blink_mojo_sources)',

'<@(blink_android_mojo_sources)',

- 'platform/modules/bluetooth/web_bluetooth.mojom',

'mojom_typemaps': [

'<(DEPTH)/cc/ipc/surface_id.typemap',

@@ -139,6 +139,7 @@

'<@(blink_android_mojo_sources)',

'mojom_typemaps': [

+ '../../../device/bluetooth/public/interfaces/bluetooth_uuid.typemap',

'<(DEPTH)/cc/ipc/surface_id.typemap',

'<(DEPTH)/cc/ipc/surface_sequence.typemap',

@@ -159,8 +160,8 @@

'dependencies': [

'mojo_bindings_blink_mojom',

'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',