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

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

Issue 1111563002: Revert of Add CPP API for BLE advertisments. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « device/bluetooth/bluetooth_adapter.h ('k') | device/bluetooth/bluetooth_adapter_chromeos.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_BLUETOOTH_ADAPTER_CHROMEOS_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 #include <string> 10 #include <string>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 void CreateL2capService( 89 void CreateL2capService(
90 const device::BluetoothUUID& uuid, 90 const device::BluetoothUUID& uuid,
91 const ServiceOptions& options, 91 const ServiceOptions& options,
92 const CreateServiceCallback& callback, 92 const CreateServiceCallback& callback,
93 const CreateServiceErrorCallback& error_callback) override; 93 const CreateServiceErrorCallback& error_callback) override;
94 void RegisterAudioSink( 94 void RegisterAudioSink(
95 const device::BluetoothAudioSink::Options& options, 95 const device::BluetoothAudioSink::Options& options,
96 const device::BluetoothAdapter::AcquiredCallback& callback, 96 const device::BluetoothAdapter::AcquiredCallback& callback,
97 const device::BluetoothAudioSink::ErrorCallback& error_callback) override; 97 const device::BluetoothAudioSink::ErrorCallback& error_callback) override;
98 98
99 void RegisterAdvertisement(
100 scoped_ptr<device::BluetoothAdvertisement::Data> advertisement_data,
101 const CreateAdvertisementCallback& callback,
102 const CreateAdvertisementErrorCallback& error_callback) override;
103
104 // Locates the device object by object path (the devices map and 99 // Locates the device object by object path (the devices map and
105 // BluetoothDevice methods are by address). 100 // BluetoothDevice methods are by address).
106 BluetoothDeviceChromeOS* GetDeviceWithPath( 101 BluetoothDeviceChromeOS* GetDeviceWithPath(
107 const dbus::ObjectPath& object_path); 102 const dbus::ObjectPath& object_path);
108 103
109 // Announce to observers a change in device state that is not reflected by 104 // Announce to observers a change in device state that is not reflected by
110 // its D-Bus properties. 105 // its D-Bus properties.
111 void NotifyDeviceChanged(BluetoothDeviceChromeOS* device); 106 void NotifyDeviceChanged(BluetoothDeviceChromeOS* device);
112 107
113 // The following methods are used to send various GATT observer events to 108 // The following methods are used to send various GATT observer events to
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 // Note: This should remain the last member so it'll be destroyed and 369 // Note: This should remain the last member so it'll be destroyed and
375 // invalidate its weak pointers before any other members are destroyed. 370 // invalidate its weak pointers before any other members are destroyed.
376 base::WeakPtrFactory<BluetoothAdapterChromeOS> weak_ptr_factory_; 371 base::WeakPtrFactory<BluetoothAdapterChromeOS> weak_ptr_factory_;
377 372
378 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS); 373 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS);
379 }; 374 };
380 375
381 } // namespace chromeos 376 } // namespace chromeos
382 377
383 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_ 378 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
OLDNEW
« no previous file with comments | « device/bluetooth/bluetooth_adapter.h ('k') | device/bluetooth/bluetooth_adapter_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698