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

Unified Diff: device/bluetooth/bluetooth_gatt_connection_bluez.cc

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_gatt_connection_bluez.cc
diff --git a/device/bluetooth/bluetooth_gatt_connection_chromeos.cc b/device/bluetooth/bluetooth_gatt_connection_bluez.cc
similarity index 86%
rename from device/bluetooth/bluetooth_gatt_connection_chromeos.cc
rename to device/bluetooth/bluetooth_gatt_connection_bluez.cc
index 57aaa4d399ad5248704e5076bfd979ed8094bc62..98b6a4699bd4b8b51b5b99d568a99decf620085e 100644
--- a/device/bluetooth/bluetooth_gatt_connection_chromeos.cc
+++ b/device/bluetooth/bluetooth_gatt_connection_bluez.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device/bluetooth/bluetooth_gatt_connection_chromeos.h"
+#include "device/bluetooth/bluetooth_gatt_connection_bluez.h"
#include "base/bind.h"
#include "base/logging.h"
@@ -10,9 +10,9 @@
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
-namespace chromeos {
+namespace bluez {
-BluetoothGattConnectionChromeOS::BluetoothGattConnectionChromeOS(
+BluetoothGattConnectionBlueZ::BluetoothGattConnectionBlueZ(
scoped_refptr<device::BluetoothAdapter> adapter,
const std::string& device_address,
const dbus::ObjectPath& object_path)
@@ -26,13 +26,13 @@ BluetoothGattConnectionChromeOS::BluetoothGattConnectionChromeOS(
bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->AddObserver(this);
}
-BluetoothGattConnectionChromeOS::~BluetoothGattConnectionChromeOS() {
+BluetoothGattConnectionBlueZ::~BluetoothGattConnectionBlueZ() {
bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->RemoveObserver(
this);
Disconnect();
}
-bool BluetoothGattConnectionChromeOS::IsConnected() {
+bool BluetoothGattConnectionBlueZ::IsConnected() {
// Lazily determine the activity state of the connection. If already
// marked as inactive, then return false. Otherwise, explicitly mark
// |connected_| as false if the device is removed or disconnected. We do this,
@@ -50,7 +50,7 @@ bool BluetoothGattConnectionChromeOS::IsConnected() {
return connected_;
}
-void BluetoothGattConnectionChromeOS::Disconnect() {
+void BluetoothGattConnectionBlueZ::Disconnect() {
if (!connected_) {
VLOG(1) << "Connection already inactive.";
return;
@@ -66,7 +66,7 @@ void BluetoothGattConnectionChromeOS::Disconnect() {
connected_ = false;
}
-void BluetoothGattConnectionChromeOS::DeviceRemoved(
+void BluetoothGattConnectionBlueZ::DeviceRemoved(
const dbus::ObjectPath& object_path) {
if (object_path != object_path_)
return;
@@ -74,7 +74,7 @@ void BluetoothGattConnectionChromeOS::DeviceRemoved(
connected_ = false;
}
-void BluetoothGattConnectionChromeOS::DevicePropertyChanged(
+void BluetoothGattConnectionBlueZ::DevicePropertyChanged(
const dbus::ObjectPath& object_path,
const std::string& property_name) {
if (object_path != object_path_)
@@ -102,4 +102,4 @@ void BluetoothGattConnectionChromeOS::DevicePropertyChanged(
device_address_ = properties->address.value();
}
-} // namespace chromeos
+} // namespace bluez

Powered by Google App Engine
This is Rietveld 408576698