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

Side by Side Diff: device/bluetooth/bluez/bluetooth_device_bluez.h

Issue 2228953003: bluetooth: Change GetInquiryTxPower and GetInquiryRSSI to return optional. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: TIL value_or Created 4 years, 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
6 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_ 6 #define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 uint16_t GetProductID() const override; 55 uint16_t GetProductID() const override;
56 uint16_t GetDeviceID() const override; 56 uint16_t GetDeviceID() const override;
57 uint16_t GetAppearance() const override; 57 uint16_t GetAppearance() const override;
58 base::Optional<std::string> GetName() const override; 58 base::Optional<std::string> GetName() const override;
59 bool IsPaired() const override; 59 bool IsPaired() const override;
60 bool IsConnected() const override; 60 bool IsConnected() const override;
61 bool IsGattConnected() const override; 61 bool IsGattConnected() const override;
62 bool IsConnectable() const override; 62 bool IsConnectable() const override;
63 bool IsConnecting() const override; 63 bool IsConnecting() const override;
64 UUIDList GetUUIDs() const override; 64 UUIDList GetUUIDs() const override;
65 int16_t GetInquiryRSSI() const override; 65 base::Optional<int8_t> GetInquiryRSSI() const override;
66 int16_t GetInquiryTxPower() const override; 66 base::Optional<int8_t> GetInquiryTxPower() const override;
67 bool ExpectingPinCode() const override; 67 bool ExpectingPinCode() const override;
68 bool ExpectingPasskey() const override; 68 bool ExpectingPasskey() const override;
69 bool ExpectingConfirmation() const override; 69 bool ExpectingConfirmation() const override;
70 void GetConnectionInfo(const ConnectionInfoCallback& callback) override; 70 void GetConnectionInfo(const ConnectionInfoCallback& callback) override;
71 void Connect(device::BluetoothDevice::PairingDelegate* pairing_delegate, 71 void Connect(device::BluetoothDevice::PairingDelegate* pairing_delegate,
72 const base::Closure& callback, 72 const base::Closure& callback,
73 const ConnectErrorCallback& error_callback) override; 73 const ConnectErrorCallback& error_callback) override;
74 void SetPinCode(const std::string& pincode) override; 74 void SetPinCode(const std::string& pincode) override;
75 void SetPasskey(uint32_t passkey) override; 75 void SetPasskey(uint32_t passkey) override;
76 void ConfirmPairing() override; 76 void ConfirmPairing() override;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // Note: This should remain the last member so it'll be destroyed and 245 // Note: This should remain the last member so it'll be destroyed and
246 // invalidate its weak pointers before any other members are destroyed. 246 // invalidate its weak pointers before any other members are destroyed.
247 base::WeakPtrFactory<BluetoothDeviceBlueZ> weak_ptr_factory_; 247 base::WeakPtrFactory<BluetoothDeviceBlueZ> weak_ptr_factory_;
248 248
249 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceBlueZ); 249 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceBlueZ);
250 }; 250 };
251 251
252 } // namespace bluez 252 } // namespace bluez
253 253
254 #endif // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_ 254 #endif // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_DEVICE_BLUEZ_H_
OLDNEW
« no previous file with comments | « device/bluetooth/bluez/bluetooth_bluez_unittest.cc ('k') | device/bluetooth/bluez/bluetooth_device_bluez.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698