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

Unified Diff: device/bluetooth/bluetooth_adapter_profile_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_adapter_profile_bluez.h
diff --git a/device/bluetooth/bluetooth_adapter_profile_chromeos.h b/device/bluetooth/bluetooth_adapter_profile_bluez.h
similarity index 80%
rename from device/bluetooth/bluetooth_adapter_profile_chromeos.h
rename to device/bluetooth/bluetooth_adapter_profile_bluez.h
index 35971e8f9c685e9edb15fb75075733fd1fb86bf1..5382c8fcdaea5119dee5c48539edb155e513cef2 100644
--- a/device/bluetooth/bluetooth_adapter_profile_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_profile_bluez.h
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_CHROMEOS_H_
-#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_CHROMEOS_H_
+#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_BLUEZ_H_
+#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_BLUEZ_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "device/bluetooth/bluetooth_adapter_chromeos.h"
+#include "device/bluetooth/bluetooth_adapter_bluez.h"
#include "device/bluetooth/bluetooth_export.h"
#include "device/bluetooth/dbus/bluetooth_profile_manager_client.h"
#include "device/bluetooth/dbus/bluetooth_profile_service_provider.h"
@@ -15,9 +16,9 @@ namespace device {
class BluetoothUUID;
} // namespace device
-namespace chromeos {
+namespace bluez {
-// The BluetoothAdapterProfileChromeOS class implements a multiplexing
+// The BluetoothAdapterProfileBlueZ class implements a multiplexing
// profile for custom Bluetooth services managed by a BluetoothAdapter.
// Maintains a list of delegates which may serve the profile.
// One delegate is allowed for each device.
@@ -25,13 +26,13 @@ namespace chromeos {
// This class is not thread-safe, but is only called from the dbus origin
// thread.
//
-// BluetoothAdapterProfileChromeOS objects are owned by the
-// BluetoothAdapterChromeOS and allocated through Register()
-class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterProfileChromeOS
+// BluetoothAdapterProfileBlueZ objects are owned by the
+// BluetoothAdapterBlueZ and allocated through Register()
+class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterProfileBlueZ
: public bluez::BluetoothProfileServiceProvider::Delegate {
public:
- typedef base::Callback<void(scoped_ptr<BluetoothAdapterProfileChromeOS>
- profile)> ProfileRegisteredCallback;
+ typedef base::Callback<void(scoped_ptr<BluetoothAdapterProfileBlueZ> profile)>
+ ProfileRegisteredCallback;
// Registers a profile with the BlueZ server for |uuid| with the
// options |options|. |success_callback| is provided with a newly
@@ -44,7 +45,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterProfileChromeOS
const bluez::BluetoothProfileManagerClient::ErrorCallback&
error_callback);
- ~BluetoothAdapterProfileChromeOS() override;
+ ~BluetoothAdapterProfileBlueZ() override;
// The object path of the profile.
const dbus::ObjectPath& object_path() const { return object_path_; }
@@ -68,7 +69,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterProfileChromeOS
size_t DelegateCount() const { return delegates_.size(); }
private:
- BluetoothAdapterProfileChromeOS(const device::BluetoothUUID& uuid);
+ BluetoothAdapterProfileBlueZ(const device::BluetoothUUID& uuid);
// bluez::BluetoothProfileServiceProvider::Delegate:
void Released() override;
@@ -101,11 +102,11 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterProfileChromeOS
// Note: This should remain the last member so it'll be destroyed and
// invalidate its weak pointers before any other members are destroyed.
- base::WeakPtrFactory<BluetoothAdapterProfileChromeOS> weak_ptr_factory_;
+ base::WeakPtrFactory<BluetoothAdapterProfileBlueZ> weak_ptr_factory_;
- DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterProfileChromeOS);
+ DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterProfileBlueZ);
};
-} // namespace chromeos
+} // namespace bluez
-#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_CHROMEOS_H_
+#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_PROFILE_BLUEZ_H_

Powered by Google App Engine
This is Rietveld 408576698