content/content_browser.gypi - Issue 1502663003: bluetooth: Implement allowed devices map

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/content_browser.gypi

Issue 1502663003: bluetooth: Implement allowed devices map (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Fix merge conflicts Created 4 years, 11 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:

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 62f09c28da94608c38361f871c620f7905399bf5..bc4ed2117b644add9f6407e0c35cfccb34ba68cb 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -438,6 +438,8 @@

'browser/background_sync/background_sync_status.h',

'browser/bad_message.cc',

'browser/bad_message.h',

+ 'browser/bluetooth/bluetooth_allowed_devices_map.cc',

+ 'browser/bluetooth/bluetooth_allowed_devices_map.h',

'browser/bluetooth/bluetooth_dispatcher_host.cc',

'browser/bluetooth/bluetooth_dispatcher_host.h',

'browser/bluetooth/bluetooth_metrics.cc',

« no previous file with comments | « content/common/bluetooth/bluetooth_messages.h ('k') | content/content_tests.gypi » ('j') | no next file with comments »