| Index: device/bluetooth/dbus/bluez_dbus_client.h
|
| diff --git a/chromeos/dbus/dbus_client.h b/device/bluetooth/dbus/bluez_dbus_client.h
|
| similarity index 56%
|
| copy from chromeos/dbus/dbus_client.h
|
| copy to device/bluetooth/dbus/bluez_dbus_client.h
|
| index d52de3e6591d7af3fcf0a2c7c70ce2d9d1385478..3dd09853d2c586820072c346ac92d534e7f5fb18 100644
|
| --- a/chromeos/dbus/dbus_client.h
|
| +++ b/device/bluetooth/dbus/bluez_dbus_client.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 CHROMEOS_DBUS_DBUS_CLIENT_H_
|
| -#define CHROMEOS_DBUS_DBUS_CLIENT_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUEZ_DBUS_CLIENT_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUEZ_DBUS_CLIENT_H_
|
|
|
| #include "base/basictypes.h"
|
|
|
| @@ -11,14 +11,15 @@ namespace dbus {
|
| class Bus;
|
| } // namespace dbus
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| -// Interface for all DBus clients handled by DBusThreadManager. It restricts
|
| -// access to the Init function to DBusThreadManager only to prevent
|
| +// Interface for all Bluez DBus clients handled by BluezDBusManager. It
|
| +// restricts
|
| +// access to the Init function to BluezDBusManager only to prevent
|
| // incorrect calls. Stub clients may lift that restriction however.
|
| -class DBusClient {
|
| +class BluezDBusClient {
|
| protected:
|
| - virtual ~DBusClient() {}
|
| + virtual ~BluezDBusClient() {}
|
|
|
| // This function is called by DBusThreadManager. Only in unit tests, which
|
| // don't use DBusThreadManager, this function can be called through Stub
|
| @@ -26,11 +27,11 @@ class DBusClient {
|
| virtual void Init(dbus::Bus* bus) = 0;
|
|
|
| private:
|
| - friend class DBusThreadManager;
|
| + friend class BluezDBusManager;
|
|
|
| - DISALLOW_ASSIGN(DBusClient);
|
| + DISALLOW_ASSIGN(BluezDBusClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_DBUS_CLIENT_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUEZ_DBUS_CLIENT_H_
|
|
|