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

Unified Diff: device/bluetooth/bluetooth_advertisement_bluez.h

Issue 1415573014: Reland "Add Linux support for the Bluetooth API" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_advertisement_bluez.h
diff --git a/device/bluetooth/bluetooth_advertisement_chromeos.h b/device/bluetooth/bluetooth_advertisement_bluez.h
similarity index 69%
rename from device/bluetooth/bluetooth_advertisement_chromeos.h
rename to device/bluetooth/bluetooth_advertisement_bluez.h
index 44abec27e12d2a8d9c3851534e574d8685d9ac62..bde8cc85f64c6e73c492b9cde5f43b9b2357255f 100644
--- a/device/bluetooth/bluetooth_advertisement_chromeos.h
+++ b/device/bluetooth/bluetooth_advertisement_bluez.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_CHROMEOS_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_BLUEZ_H_
#include "base/macros.h"
#include "device/bluetooth/bluetooth_adapter.h"
@@ -15,19 +15,19 @@ namespace bluez {
class BluetoothLEAdvertisementServiceProvider;
}
-namespace chromeos {
+namespace bluez {
-class BluetoothAdapterChromeOS;
+class BluetoothAdapterBlueZ;
-// The BluetoothAdvertisementChromeOS class implements BluetoothAdvertisement
+// The BluetoothAdvertisementBlueZ class implements BluetoothAdvertisement
// for the Chrome OS platform.
ortuno 2015/11/06 18:15:42 There is a "Chrome OS" you forgot to remove here.
rkc 2015/11/25 00:48:16 Done.
-class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
+class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementBlueZ
: public device::BluetoothAdvertisement,
public bluez::BluetoothLEAdvertisementServiceProvider::Delegate {
public:
- BluetoothAdvertisementChromeOS(
+ BluetoothAdvertisementBlueZ(
scoped_ptr<device::BluetoothAdvertisement::Data> data,
- scoped_refptr<BluetoothAdapterChromeOS> adapter);
+ scoped_refptr<BluetoothAdapterBlueZ> adapter);
// BluetoothAdvertisement overrides:
void Unregister(const SuccessCallback& success_callback,
@@ -48,15 +48,15 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
}
private:
- ~BluetoothAdvertisementChromeOS() override;
+ ~BluetoothAdvertisementBlueZ() override;
// Adapter this advertisement is advertising on.
- scoped_refptr<BluetoothAdapterChromeOS> adapter_;
+ scoped_refptr<BluetoothAdapterBlueZ> adapter_;
scoped_ptr<bluez::BluetoothLEAdvertisementServiceProvider> provider_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisementChromeOS);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisementBlueZ);
};
-} // namespace chromeos
+} // namespace bluez
-#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_CHROMEOS_H_
+#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_BLUEZ_H_

Powered by Google App Engine
This is Rietveld 408576698