| 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 79828c7e597ef758c098ca24452b2da1e44fbdb5..4d86b4f731c3219ac02f3cd73a311261a01ec035 100644
|
| --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
| @@ -18,6 +18,7 @@
|
| #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;
|
| @@ -63,17 +64,17 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
| // 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 std::string& uuid,
|
| + 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 std::string& uuid);
|
| + void RemoveProfile(const device::BluetoothUUID& uuid);
|
|
|
| // Returns true if the BluetoothProfile corresponding to |uuid| is already
|
| // registered.
|
| - bool HasProfile(const std::string& uuid) const;
|
| + 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
|
| @@ -96,7 +97,7 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
|
|
| // Returns the BluetoothProfile that corresponds to |uuid|. It returns NULL
|
| // if the BluetoothProfile with |uuid| does not exist.
|
| - device::BluetoothProfile* GetProfile(const std::string& uuid) const;
|
| + device::BluetoothProfile* GetProfile(const device::BluetoothUUID& uuid) const;
|
|
|
| // Get the BluetoothSocket corresponding to |id|.
|
| scoped_refptr<device::BluetoothSocket> GetSocket(int id);
|
| @@ -104,7 +105,7 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
| // Dispatch an event that takes a connection socket as a parameter to the
|
| // extension that registered the profile that the socket has connected to.
|
| void DispatchConnectionEvent(const std::string& extension_id,
|
| - const std::string& uuid,
|
| + const device::BluetoothUUID& uuid,
|
| const device::BluetoothDevice* device,
|
| scoped_refptr<device::BluetoothSocket> socket);
|
|
|
| @@ -187,7 +188,7 @@ class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
|
|
|
| // Maps uuids to a struct containing a Bluetooth profile and its
|
| // associated extension id.
|
| - typedef std::map<std::string, ExtensionBluetoothProfileRecord>
|
| + typedef std::map<device::BluetoothUUID, ExtensionBluetoothProfileRecord>
|
| BluetoothProfileMap;
|
| BluetoothProfileMap bluetooth_profile_map_;
|
|
|
|
|