third_party/WebKit/Source/modules/bluetooth/BluetoothError.h - Issue 2142813003: bluetooth: Avoid including non-blink mojo bindings in blink code

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/BluetoothError.h

Issue 2142813003: bluetooth: Avoid including non-blink mojo bindings in blink code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Go back to static cast 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

« content/renderer/bluetooth/web_bluetooth_impl.cc ('K') | « content/renderer/bluetooth/web_bluetooth_impl.cc ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp » ('j') | third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6fcf7de19542a5afef873db37475ad97c7869456..248cb33401e5c202ab2d96c057533730dd6188ce 100644

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

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

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

#define BluetoothError_h

#include "platform/heap/Handle.h"

-#include "public/platform/modules/bluetooth/WebBluetoothError.h"

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

Jeffrey Yasskin 2016/07/13 20:34:58 Is this include used anymore?

ortuno 2016/07/13 22:47:28 Ah I guess not in the header. Moved to the .cc

#include "wtf/Allocator.h"

namespace blink {

@@ -20,8 +20,8 @@ class BluetoothError {

STATIC_ONLY(BluetoothError);

public:

// Interface required by CallbackPromiseAdapter:

- using WebType = const WebBluetoothError&;

- static DOMException* take(ScriptPromiseResolver*, const WebBluetoothError&);

+ using WebType = int32_t;

Jeffrey Yasskin 2016/07/13 20:34:58 Please comment which enum this expects to receive.

ortuno 2016/07/13 22:47:28 Done.

+ static DOMException* take(ScriptPromiseResolver*, int32_t error);

};

} // namespace blink