Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1795)

Unified Diff: content/renderer/bluetooth/web_bluetooth_impl.h

Issue 2565913002: [Onion Soup] Move WebBluetoothImpl from //content/renderer/bluetooth to Blink's bluetooth module (Closed)
Patch Set: renamed BluetoothUUID.typemap to Bluetooth.typemap Created 3 years, 12 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
Index: content/renderer/bluetooth/web_bluetooth_impl.h
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.h b/content/renderer/bluetooth/web_bluetooth_impl.h
deleted file mode 100644
index 431a4e4ae004b9b71c9db060d756474c0bbbc14a..0000000000000000000000000000000000000000
--- a/content/renderer/bluetooth/web_bluetooth_impl.h
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
-#define CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
-
-#include <stdint.h>
-
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
-
-#include "base/compiler_specific.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "content/common/bluetooth/web_bluetooth_device_id.h"
-#include "content/common/content_export.h"
-#include "mojo/public/cpp/bindings/associated_binding.h"
-#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetooth.h"
-#include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
-
-namespace blink {
-class WebBluetoothRemoteGATTCharacteristic;
-}
-
-namespace service_manager {
-class InterfaceProvider;
-}
-
-namespace content {
-
-class BluetoothDispatcher;
-
-// Implementation of blink::WebBluetooth. Passes calls through to the thread
-// specific BluetoothDispatcher.
-class CONTENT_EXPORT WebBluetoothImpl
- : NON_EXPORTED_BASE(public blink::mojom::WebBluetoothServiceClient),
- NON_EXPORTED_BASE(public blink::WebBluetooth) {
- public:
- WebBluetoothImpl(service_manager::InterfaceProvider* remote_interfaces);
- ~WebBluetoothImpl() override;
-
- // blink::WebBluetooth interface:
- void requestDevice(
- const blink::WebRequestDeviceOptions& options,
- blink::WebBluetoothRequestDeviceCallbacks* callbacks) override;
- void connect(
- const blink::WebString& device_id,
- blink::WebBluetoothDevice* device,
- blink::WebBluetoothRemoteGATTServerConnectCallbacks* callbacks) override;
- void disconnect(const blink::WebString& device_id) override;
- void getPrimaryServices(
- const blink::WebString& device_id,
- int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
- web_bluetooth.mojom */,
- const blink::WebString& services_uuid,
- blink::WebBluetoothGetPrimaryServicesCallbacks* callbacks) override;
- void getCharacteristics(
- const blink::WebString& service_instance_id,
- int32_t quantity /* Corresponds to WebBluetoothGATTQueryQuantity in
- web_bluetooth.mojom */,
- const blink::WebString& characteristics_uuid,
- blink::WebBluetoothGetCharacteristicsCallbacks* callbacks) override;
- void readValue(const blink::WebString& characteristic_instance_id,
- blink::WebBluetoothReadValueCallbacks* callbacks) override;
- void writeValue(const blink::WebString& characteristic_instance_id,
- const blink::WebVector<uint8_t>& value,
- blink::WebBluetoothWriteValueCallbacks*) override;
- void startNotifications(
- const blink::WebString& characteristic_instance_id,
- blink::WebBluetoothNotificationsCallbacks*) override;
- void stopNotifications(
- const blink::WebString& characteristic_instance_id,
- blink::WebBluetoothNotificationsCallbacks*) override;
- void characteristicObjectRemoved(
- const blink::WebString& characteristic_instance_id,
- blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
- void registerCharacteristicObject(
- const blink::WebString& characteristic_instance_id,
- blink::WebBluetoothRemoteGATTCharacteristic* characteristic) override;
-
- private:
- struct GetCharacteristicsCallback;
- // WebBluetoothServiceClient methods:
- void RemoteCharacteristicValueChanged(
- const std::string& characteristic_instance_id,
- const std::vector<uint8_t>& value) override;
- void GattServerDisconnected(const WebBluetoothDeviceId& device_id) override;
-
- // Callbacks for WebBluetoothService calls:
- void OnRequestDeviceComplete(
- std::unique_ptr<blink::WebBluetoothRequestDeviceCallbacks> callbacks,
- const blink::mojom::WebBluetoothResult result,
- blink::mojom::WebBluetoothDevicePtr device);
- void OnConnectComplete(
- std::unique_ptr<blink::WebBluetoothRemoteGATTServerConnectCallbacks>
- callbacks,
- blink::mojom::WebBluetoothResult result);
- void OnGetPrimaryServicesComplete(
- const blink::WebString& device_id,
- std::unique_ptr<blink::WebBluetoothGetPrimaryServicesCallbacks> callbacks,
- blink::mojom::WebBluetoothResult result,
- base::Optional<
- std::vector<blink::mojom::WebBluetoothRemoteGATTServicePtr>>
- services);
- void OnGetCharacteristicsComplete(
- const blink::WebString& service_instance_id,
- std::unique_ptr<blink::WebBluetoothGetCharacteristicsCallbacks> callbacks,
- blink::mojom::WebBluetoothResult result,
- base::Optional<
- std::vector<blink::mojom::WebBluetoothRemoteGATTCharacteristicPtr>>
- characteristics);
- void OnReadValueComplete(
- std::unique_ptr<blink::WebBluetoothReadValueCallbacks> callbacks,
- blink::mojom::WebBluetoothResult result,
- const base::Optional<std::vector<uint8_t>>& value);
- void OnWriteValueComplete(
- const blink::WebVector<uint8_t>& value,
- std::unique_ptr<blink::WebBluetoothWriteValueCallbacks> callbacks,
- blink::mojom::WebBluetoothResult result);
- void OnStartNotificationsComplete(
- std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks,
- blink::mojom::WebBluetoothResult result);
- void OnStopNotificationsComplete(
- std::unique_ptr<blink::WebBluetoothNotificationsCallbacks> callbacks);
-
- void DispatchCharacteristicValueChanged(
- const std::string& characteristic_instance_id,
- const std::vector<uint8_t>& value);
-
- blink::mojom::WebBluetoothService& GetWebBluetoothService();
- service_manager::InterfaceProvider* const remote_interfaces_;
- blink::mojom::WebBluetoothServicePtr web_bluetooth_service_;
-
- // Map of characteristic_instance_ids to
- // WebBluetoothRemoteGATTCharacteristics. When characteristicObjectRemoved is
- // called the characteristic should be removed from the map.
- // Keeps track of what characteristics have listeners.
- std::unordered_map<std::string, blink::WebBluetoothRemoteGATTCharacteristic*>
- active_characteristics_;
-
- // Map of device_ids to WebBluetoothDevices. Added in connect() and removed in
- // disconnect(). This means a device may not actually be connected while in
- // this map, but that it will definitely be removed when the page navigates.
- std::unordered_map<WebBluetoothDeviceId,
- blink::WebBluetoothDevice*,
- WebBluetoothDeviceIdHash>
- connected_devices_;
-
- // Binding associated with |web_bluetooth_service_|.
- mojo::AssociatedBinding<blink::mojom::WebBluetoothServiceClient> binding_;
-
- DISALLOW_COPY_AND_ASSIGN(WebBluetoothImpl);
-};
-
-} // namespace content
-
-#endif // CONTENT_RENDERER_BLUETOOTH_WEB_BLUETOOTH_IMPL_H_
« no previous file with comments | « content/renderer/bluetooth/bluetooth_type_converters.cc ('k') | content/renderer/bluetooth/web_bluetooth_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698