Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth_device_mac.h

diff --git a/src/device/bluetooth/bluetooth_device_mac.h b/src/device/bluetooth/bluetooth_device_mac.h
index b107573..8f0ed08 100644 (file)
--- a/src/device/bluetooth/bluetooth_device_mac.h
+++ b/src/device/bluetooth/bluetooth_device_mac.h
@@ -21,49 +21,50 @@ namespace device {
 class BluetoothDeviceMac : public BluetoothDevice {
  public:
   explicit BluetoothDeviceMac(IOBluetoothDevice* device);
-  virtual ~BluetoothDeviceMac();
+  ~BluetoothDeviceMac() override;
 
   // BluetoothDevice override
-  virtual uint32 GetBluetoothClass() const OVERRIDE;
-  virtual std::string GetAddress() const OVERRIDE;
-  virtual VendorIDSource GetVendorIDSource() const OVERRIDE;
-  virtual uint16 GetVendorID() const OVERRIDE;
-  virtual uint16 GetProductID() const OVERRIDE;
-  virtual uint16 GetDeviceID() const OVERRIDE;
-  virtual int GetRSSI() const OVERRIDE;
-  virtual int GetCurrentHostTransmitPower() const OVERRIDE;
-  virtual int GetMaximumHostTransmitPower() const OVERRIDE;
-  virtual bool IsPaired() const OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectable() const OVERRIDE;
-  virtual bool IsConnecting() const OVERRIDE;
-  virtual UUIDList GetUUIDs() const OVERRIDE;
-  virtual bool ExpectingPinCode() const OVERRIDE;
-  virtual bool ExpectingPasskey() const OVERRIDE;
-  virtual bool ExpectingConfirmation() const OVERRIDE;
-  virtual void Connect(
-      PairingDelegate* pairing_delegate,
-      const base::Closure& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
-  virtual void SetPinCode(const std::string& pincode) OVERRIDE;
-  virtual void SetPasskey(uint32 passkey) OVERRIDE;
-  virtual void ConfirmPairing() OVERRIDE;
-  virtual void RejectPairing() OVERRIDE;
-  virtual void CancelPairing() OVERRIDE;
-  virtual void Disconnect(
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void Forget(const ErrorCallback& error_callback) OVERRIDE;
-  virtual void ConnectToService(
+  uint32 GetBluetoothClass() const override;
+  std::string GetAddress() const override;
+  VendorIDSource GetVendorIDSource() const override;
+  uint16 GetVendorID() const override;
+  uint16 GetProductID() const override;
+  uint16 GetDeviceID() const override;
+  int GetRSSI() const override;
+  int GetCurrentHostTransmitPower() const override;
+  int GetMaximumHostTransmitPower() const override;
+  bool IsPaired() const override;
+  bool IsConnected() const override;
+  bool IsConnectable() const override;
+  bool IsConnecting() const override;
+  UUIDList GetUUIDs() const override;
+  bool ExpectingPinCode() const override;
+  bool ExpectingPasskey() const override;
+  bool ExpectingConfirmation() const override;
+  void Connect(PairingDelegate* pairing_delegate,
+               const base::Closure& callback,
+               const ConnectErrorCallback& error_callback) override;
+  void SetPinCode(const std::string& pincode) override;
+  void SetPasskey(uint32 passkey) override;
+  void ConfirmPairing() override;
+  void RejectPairing() override;
+  void CancelPairing() override;
+  void Disconnect(const base::Closure& callback,
+                  const ErrorCallback& error_callback) override;
+  void Forget(const ErrorCallback& error_callback) override;
+  void ConnectToService(
       const BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
-      const ConnectToServiceErrorCallback& error_callback) OVERRIDE;
-  virtual void CreateGattConnection(
+      const ConnectToServiceErrorCallback& error_callback) override;
+  void ConnectToServiceInsecurely(
+      const BluetoothUUID& uuid,
+      const ConnectToServiceCallback& callback,
+      const ConnectToServiceErrorCallback& error_callback) override;
+  void CreateGattConnection(
       const GattConnectionCallback& callback,
-      const ConnectErrorCallback& error_callback) OVERRIDE;
-  virtual void StartConnectionMonitor(
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+      const ConnectErrorCallback& error_callback) override;
+  void StartConnectionMonitor(const base::Closure& callback,
+                              const ErrorCallback& error_callback) override;
 
   // Returns the timestamp when the device was last seen during an inquiry.
   // Returns nil if the device has never been seen during an inquiry.
@@ -75,7 +76,7 @@ class BluetoothDeviceMac : public BluetoothDevice {
 
  protected:
   // BluetoothDevice override
-  virtual std::string GetDeviceName() const OVERRIDE;
+  std::string GetDeviceName() const override;
 
  private:
   friend class BluetoothAdapterMac;