| Index: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| index d3c3a9ad7e919b3b0ac2284e099693f6f4346f9c..f5547c96329bddd534010d8c82429e354f3d0943 100644
|
| --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| @@ -17,8 +17,6 @@
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
| -#include "device/bluetooth/bluetooth_socket.h"
|
| -#include "device/bluetooth/bluetooth_uuid.h"
|
|
|
| namespace content {
|
| class BrowserContext;
|
| @@ -28,7 +26,6 @@ namespace device {
|
|
|
| class BluetoothDevice;
|
| class BluetoothDiscoverySession;
|
| -class BluetoothProfile;
|
|
|
| } // namespace device
|
|
|
| @@ -49,22 +46,6 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
| void GetAdapter(
|
| const device::BluetoothAdapterFactory::AdapterCallback& callback);
|
|
|
| - // Add the BluetoothProfile |bluetooth_profile| for use by the extension
|
| - // system. This class will hold onto the profile until RemoveProfile is
|
| - // called for the profile, or until the extension that added the profile
|
| - // is disabled/reloaded.
|
| - void AddProfile(const device::BluetoothUUID& uuid,
|
| - const std::string& extension_id,
|
| - device::BluetoothProfile* bluetooth_profile);
|
| -
|
| - // Unregister the BluetoothProfile corersponding to |uuid| and release the
|
| - // object from this class.
|
| - void RemoveProfile(const device::BluetoothUUID& uuid);
|
| -
|
| - // Returns true if the BluetoothProfile corresponding to |uuid| is already
|
| - // registered.
|
| - bool HasProfile(const device::BluetoothUUID& uuid) const;
|
| -
|
| // Requests that a new device discovery session be initiated for extension
|
| // with id |extension_id|. |callback| is called, if a session has been
|
| // initiated. |error_callback| is called, if the adapter failed to initiate
|
| @@ -84,10 +65,6 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
| const base::Closure& callback,
|
| const base::Closure& error_callback);
|
|
|
| - // Returns the BluetoothProfile that corresponds to |uuid|. It returns NULL
|
| - // if the BluetoothProfile with |uuid| does not exist.
|
| - device::BluetoothProfile* GetProfile(const device::BluetoothUUID& uuid) const;
|
| -
|
| // Called when a bluetooth event listener is added.
|
| void OnListenerAdded();
|
|
|
| @@ -135,10 +112,6 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|
| private:
|
| - // Forward declarations of internal structs.
|
| - struct ExtensionBluetoothSocketRecord;
|
| - struct ExtensionBluetoothProfileRecord;
|
| -
|
| void OnAdapterInitialized(const base::Closure& callback,
|
| scoped_refptr<device::BluetoothAdapter> adapter);
|
| void MaybeReleaseAdapter();
|
| @@ -157,12 +130,6 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
|
|
| int num_event_listeners_;
|
|
|
| - // Maps uuids to a struct containing a Bluetooth profile and its
|
| - // associated extension id.
|
| - typedef std::map<device::BluetoothUUID, ExtensionBluetoothProfileRecord>
|
| - BluetoothProfileMap;
|
| - BluetoothProfileMap bluetooth_profile_map_;
|
| -
|
| // A map that maps extension ids to BluetoothDiscoverySession pointers.
|
| typedef std::map<std::string, device::BluetoothDiscoverySession*>
|
| DiscoverySessionMap;
|
|
|