third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h - Issue 1403323007: bluetooth: WIP Advertising Data

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/Source/modules/bluetooth/BluetoothDevice.h

Issue 1403323007: bluetooth: WIP Advertising Data (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-characteristic-properties

Patch Set: Created 5 years, 2 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 | « third_party/WebKit/Source/modules/bluetooth/BluetoothAdvertisingData.idl ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h

diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h

index fa40a92c1483fac6d474cc8a6910fc22d26f0899..2afc4f7f813107456edc26cdb470ef28fd148d99 100644

--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h

+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.h

@@ -14,6 +14,7 @@

namespace blink {

+class BluetoothAdvertisingData;

class ScriptPromise;

class ScriptPromiseResolver;

class ScriptState;

@@ -43,6 +44,7 @@ public:

// IDL exposed interface:

String instanceID() { return m_webDevice->instanceID; }

String name() { return m_webDevice->name; }

+ BluetoothAdvertisingData* adData() { return m_adData; }

unsigned deviceClass(bool& isNull);

String vendorIDSource();

unsigned vendorID(bool& isNull);

@@ -53,6 +55,7 @@ public:

private:

OwnPtr<WebBluetoothDevice> m_webDevice;

+ Member<BluetoothAdvertisingData> m_adData;

};

} // namespace blink