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

Side by Side Diff: device/bluetooth/bluetooth_gatt_connection_chromeos.h

Issue 628873002: replace OVERRIDE and FINAL with override and final in device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 16 matching lines...) Expand all
27 : public device::BluetoothGattConnection, 27 : public device::BluetoothGattConnection,
28 public BluetoothDeviceClient::Observer { 28 public BluetoothDeviceClient::Observer {
29 public: 29 public:
30 explicit BluetoothGattConnectionChromeOS( 30 explicit BluetoothGattConnectionChromeOS(
31 scoped_refptr<device::BluetoothAdapter> adapter, 31 scoped_refptr<device::BluetoothAdapter> adapter,
32 const std::string& device_address, 32 const std::string& device_address,
33 const dbus::ObjectPath& object_path); 33 const dbus::ObjectPath& object_path);
34 virtual ~BluetoothGattConnectionChromeOS(); 34 virtual ~BluetoothGattConnectionChromeOS();
35 35
36 // BluetoothGattConnection overrides. 36 // BluetoothGattConnection overrides.
37 virtual std::string GetDeviceAddress() const OVERRIDE; 37 virtual std::string GetDeviceAddress() const override;
38 virtual bool IsConnected() OVERRIDE; 38 virtual bool IsConnected() override;
39 virtual void Disconnect(const base::Closure& callback) OVERRIDE; 39 virtual void Disconnect(const base::Closure& callback) override;
40 40
41 private: 41 private:
42 42
43 // chromeos::BluetoothDeviceClient::Observer overrides. 43 // chromeos::BluetoothDeviceClient::Observer overrides.
44 virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE; 44 virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override;
45 virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path, 45 virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path,
46 const std::string& property_name) OVERRIDE; 46 const std::string& property_name) override;
47 47
48 // True, if the connection is currently active. 48 // True, if the connection is currently active.
49 bool connected_; 49 bool connected_;
50 50
51 // The Bluetooth adapter that this connection is associated with. 51 // The Bluetooth adapter that this connection is associated with.
52 scoped_refptr<device::BluetoothAdapter> adapter_; 52 scoped_refptr<device::BluetoothAdapter> adapter_;
53 53
54 // Bluetooth address of the underlying device. 54 // Bluetooth address of the underlying device.
55 std::string device_address_; 55 std::string device_address_;
56 56
57 // D-Bus object path of the underlying device. This is used to filter observer 57 // D-Bus object path of the underlying device. This is used to filter observer
58 // events. 58 // events.
59 dbus::ObjectPath object_path_; 59 dbus::ObjectPath object_path_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(BluetoothGattConnectionChromeOS); 61 DISALLOW_COPY_AND_ASSIGN(BluetoothGattConnectionChromeOS);
62 }; 62 };
63 63
64 } // namespace chromeos 64 } // namespace chromeos
65 65
66 #endif // DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_ 66 #endif // DEVICE_BLUETOOTH_BLUETOOTH_GATT_CONNECTION_CHROMEOS_H_
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_gatt_chromeos_unittest.cc ('k') | device/bluetooth/bluetooth_gatt_notify_session_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698