content/renderer/bluetooth/bluetooth_type_converters.h - Issue 2015463004: bluetooth: Use BluetoothUUID instead of string when sending uuids

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/renderer/bluetooth/bluetooth_type_converters.h

Issue 2015463004: bluetooth: Use BluetoothUUID instead of string when sending uuids (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-mojo-request-device

Patch Set: Fix merge conflict Created 4 years, 6 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/browser/bluetooth/web_bluetooth_service_impl.cc ('k') | content/renderer/bluetooth/bluetooth_type_converters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/bluetooth/bluetooth_type_converters.h

diff --git a/content/renderer/bluetooth/bluetooth_type_converters.h b/content/renderer/bluetooth/bluetooth_type_converters.h

index 960c1f5cd7d5d960d6988f11a982b4f58c183656..2b6e5263d4f8ef90cb4f2a5e33d24720532da1fd 100644

--- a/content/renderer/bluetooth/bluetooth_type_converters.h

+++ b/content/renderer/bluetooth/bluetooth_type_converters.h

@@ -5,7 +5,10 @@

#ifndef CONTENT_RENDERER_BLUETOOTH_BLUETOOTH_TYPE_CONVERTERS_H_

#define CONTENT_RENDERER_BLUETOOTH_BLUETOOTH_TYPE_CONVERTERS_H_

+#include "base/optional.h"

+#include "device/bluetooth/bluetooth_uuid.h"

#include "mojo/public/cpp/bindings/type_converter.h"

+#include "third_party/WebKit/public/platform/WebString.h"

#include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"

namespace blink {

@@ -29,6 +32,12 @@ struct TypeConverter<blink::mojom::WebBluetoothRequestDeviceOptionsPtr,

const blink::WebRequestDeviceOptions& web_options);

};

+template <>

+struct TypeConverter<base::Optional<device::BluetoothUUID>, blink::WebString> {

+ static base::Optional<device::BluetoothUUID> Convert(

+ const blink::WebString& web_string);

+};

} // namespace mojo

#endif // CONTENT_RENDERER_BLUETOOTH_BLUETOOTH_TYPE_CONVERTERS_H_

« no previous file with comments | « content/browser/bluetooth/web_bluetooth_service_impl.cc ('k') | content/renderer/bluetooth/bluetooth_type_converters.cc » ('j') | no next file with comments »