third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h - Issue 1922923002: bluetooth: Move requestDevice to mojo

Unified Diff: third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h

Issue 1922923002: bluetooth: Move requestDevice to mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-separate-tests-request-device

Patch Set: Remove debug log Created 4 years, 7 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/browser/renderer_host/render_process_host_impl.cc ('K') | « third_party/WebKit/public/blink_headers.gypi ('k') | third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothError.h » ('j') | third_party/WebKit/public/platform/modules/bluetooth/WebRequestDeviceOptions.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h

diff --git a/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h b/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h

index 96c108544ab26a78f1fd703f53c074986a5018d4..13f95dfd7bc6d7e7948daac73044d04ab71939f6 100644

--- a/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h

+++ b/third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h

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

#include "public/platform/WebCallbacks.h"

#include "public/platform/WebString.h"

#include "public/platform/WebVector.h"

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

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

#include <memory>

@@ -23,26 +22,26 @@ struct WebBluetoothRemoteGATTService;

struct WebRequestDeviceOptions;

// Success and failure callbacks for requestDevice.

-using WebBluetoothRequestDeviceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothDevice>, const WebBluetoothError&>;

+using WebBluetoothRequestDeviceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothDevice>, const mojom::WebBluetoothError&>;

// Success and failure callbacks for connectGATT.

-using WebBluetoothRemoteGATTServerConnectCallbacks = WebCallbacks<void, const WebBluetoothError&>;

+using WebBluetoothRemoteGATTServerConnectCallbacks = WebCallbacks<void, const mojom::WebBluetoothError&>;

// Success and failure callbacks for getPrimaryService.

-using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothRemoteGATTService>, const WebBluetoothError&>;

+using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<std::unique_ptr<WebBluetoothRemoteGATTService>, const mojom::WebBluetoothError&>;

// Success and failure callbacks for getCharacteristic(s).

-using WebBluetoothGetCharacteristicsCallbacks = WebCallbacks<const WebVector<WebBluetoothRemoteGATTCharacteristicInit*>&, const WebBluetoothError&>;

+using WebBluetoothGetCharacteristicsCallbacks = WebCallbacks<const WebVector<WebBluetoothRemoteGATTCharacteristicInit*>&, const mojom::WebBluetoothError&>;

// Success and failure callbacks for readValue.

-using WebBluetoothReadValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const WebBluetoothError&>;

+using WebBluetoothReadValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const mojom::WebBluetoothError&>;

// Success and failure callbacks for writeValue.

-using WebBluetoothWriteValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const WebBluetoothError&>;

+using WebBluetoothWriteValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const mojom::WebBluetoothError&>;

// Success and failure callbacks for characteristic.startNotifications and

// characteristic.stopNotifications.

-using WebBluetoothNotificationsCallbacks = WebCallbacks<void, const WebBluetoothError&>;

+using WebBluetoothNotificationsCallbacks = WebCallbacks<void, const mojom::WebBluetoothError&>;

class WebBluetooth {

public: