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

Side by Side Diff: device/bluetooth/bluetooth_device_android.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: 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_DEVICE_ANDROID_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 uint16_t GetVendorID() const override; 60 uint16_t GetVendorID() const override;
61 uint16_t GetProductID() const override; 61 uint16_t GetProductID() const override;
62 uint16_t GetDeviceID() const override; 62 uint16_t GetDeviceID() const override;
63 uint16_t GetAppearance() const override; 63 uint16_t GetAppearance() const override;
64 base::Optional<std::string> GetName() const override; 64 base::Optional<std::string> GetName() const override;
65 bool IsPaired() const override; 65 bool IsPaired() const override;
66 bool IsConnected() const override; 66 bool IsConnected() const override;
67 bool IsGattConnected() const override; 67 bool IsGattConnected() const override;
68 bool IsConnectable() const override; 68 bool IsConnectable() const override;
69 bool IsConnecting() const override; 69 bool IsConnecting() const override;
70 int16_t GetInquiryRSSI() const override; 70 base::Optional<int8_t> GetInquiryRSSI() const override;
71 int16_t GetInquiryTxPower() const override; 71 base::Optional<int8_t> GetInquiryTxPower() const override;
72 bool ExpectingPinCode() const override; 72 bool ExpectingPinCode() const override;
73 bool ExpectingPasskey() const override; 73 bool ExpectingPasskey() const override;
74 bool ExpectingConfirmation() const override; 74 bool ExpectingConfirmation() const override;
75 void GetConnectionInfo(const ConnectionInfoCallback& callback) override; 75 void GetConnectionInfo(const ConnectionInfoCallback& callback) override;
76 void Connect(device::BluetoothDevice::PairingDelegate* pairing_delegate, 76 void Connect(device::BluetoothDevice::PairingDelegate* pairing_delegate,
77 const base::Closure& callback, 77 const base::Closure& callback,
78 const ConnectErrorCallback& error_callback) override; 78 const ConnectErrorCallback& error_callback) override;
79 void SetPinCode(const std::string& pincode) override; 79 void SetPinCode(const std::string& pincode) override;
80 void SetPasskey(uint32_t passkey) override; 80 void SetPasskey(uint32_t passkey) override;
81 void ConfirmPairing() override; 81 void ConfirmPairing() override;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 base::android::ScopedJavaGlobalRef<jobject> j_device_; 128 base::android::ScopedJavaGlobalRef<jobject> j_device_;
129 129
130 bool gatt_connected_ = false; 130 bool gatt_connected_ = false;
131 131
132 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceAndroid); 132 DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceAndroid);
133 }; 133 };
134 134
135 } // namespace device 135 } // namespace device
136 136
137 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_ 137 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698