diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-16 00:35:16 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-16 00:35:16 +0000 |
| commit | 61d6e608a4d9a5355e66ac9a6ba59743f650262b (patch) | |
| tree | 48aef1900fdd9db12a3834c861f716f76ebec176 /chrome/browser/chromeos/bluetooth | |
| parent | 7414152403af46252eb1a003b2a9cbb0eeeb41cf (diff) | |
| download | chromium_src-61d6e608a4d9a5355e66ac9a6ba59743f650262b.zip chromium_src-61d6e608a4d9a5355e66ac9a6ba59743f650262b.tar.gz chromium_src-61d6e608a4d9a5355e66ac9a6ba59743f650262b.tar.bz2 | |
Revert 156348 (caused http://crbug.com/149828)
- Change getDevices to use a DeviceCallback.
This modifies the getDevices method of the bluetooth Extensions API to
accept a DeviceCallback, which will be called for every matching device.
This will allow more thorough, long-running searches (involving SDP
queries) to be performed without slowing down access to matching devices
that can be returned quickly.
TEST=api test updated
BUG=134545
Review URL: https://chromiumcodereview.appspot.com/10915148
TBR=bryeung@chromium.org
Review URL: https://codereview.chromium.org/10916331
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/bluetooth')
| -rw-r--r-- | chrome/browser/chromeos/bluetooth/bluetooth_device.h | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.h b/chrome/browser/chromeos/bluetooth/bluetooth_device.h index 031dfd8..aa2fdfc 100644 --- a/chrome/browser/chromeos/bluetooth/bluetooth_device.h +++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.h @@ -201,8 +201,8 @@ class BluetoothDevice : public BluetoothDeviceClient::Observer, typedef base::Callback<void(bool)> ProvidesServiceCallback; // Indicates whether this device provides the given service. - virtual void ProvidesServiceWithName(const std::string& name, - const ProvidesServiceCallback& callback); + void ProvidesServiceWithName(const std::string& name, + const ProvidesServiceCallback& callback); // Indicates whether the device is currently pairing and expecting a // PIN Code to be returned. diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h index 7079f28..b2b7b88 100644 --- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h +++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h @@ -30,9 +30,6 @@ class MockBluetoothDevice : public BluetoothDevice { MOCK_CONST_METHOD0(IsConnected, bool()); MOCK_CONST_METHOD1(ProvidesServiceWithUUID, bool(const std::string&)); - MOCK_METHOD2(ProvidesServiceWithName, - void(const std::string&, - const ProvidesServiceCallback& callback)); MOCK_METHOD3(SetOutOfBandPairingData, void(const chromeos::BluetoothOutOfBandPairingData& data, const base::Closure& callback, |