diff options
| author | pneubeck <pneubeck@chromium.org> | 2014-09-11 02:03:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-11 09:10:17 +0000 |
| commit | ef009f18ca95c0d7b3b4a330c190a2f24b29e003 (patch) | |
| tree | 93f52e12c37ce48532dab49276fe52edf12c7c65 /chromeos/dbus/bluetooth_device_client.cc | |
| parent | f691be3b1bbbfb491e9afd283fe100acda894147 (diff) | |
| download | chromium_src-ef009f18ca95c0d7b3b4a330c190a2f24b29e003.zip chromium_src-ef009f18ca95c0d7b3b4a330c190a2f24b29e003.tar.gz chromium_src-ef009f18ca95c0d7b3b4a330c190a2f24b29e003.tar.bz2 | |
Fix minor issues about DBusThreadManager.
- Remove the global unstub_client_mask_ and accordingly make DBusThreadManager::IsUsingStub a non-static function. This makes it obvious when it's ok to call this function (and prevents misuse), namely only after the Manager is initialized.
- By moving the mask to the DBusClientBundle, the cyclic dependency between bundle and manager is broken. The Bundle does not know about the Manager anymore.
- Fix the difference between DBusClientTypeMask ("A set of DBusClients") and DBusClientType ("A single DBusClient").
BUG=408617
Review URL: https://codereview.chromium.org/556833003
Cr-Commit-Position: refs/heads/master@{#294361}
Diffstat (limited to 'chromeos/dbus/bluetooth_device_client.cc')
| -rw-r--r-- | chromeos/dbus/bluetooth_device_client.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc index b505401..00e10d3 100644 --- a/chromeos/dbus/bluetooth_device_client.cc +++ b/chromeos/dbus/bluetooth_device_client.cc @@ -56,7 +56,8 @@ class BluetoothDeviceClientImpl : public BluetoothDeviceClient, public dbus::ObjectManager::Interface { public: - BluetoothDeviceClientImpl() : weak_ptr_factory_(this) {} + BluetoothDeviceClientImpl() + : object_manager_(NULL), weak_ptr_factory_(this) {} virtual ~BluetoothDeviceClientImpl() { object_manager_->UnregisterInterface( |