summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/bluetooth_profile_service_provider.cc
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2014-09-11 02:03:49 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-11 09:10:17 +0000
commitef009f18ca95c0d7b3b4a330c190a2f24b29e003 (patch)
tree93f52e12c37ce48532dab49276fe52edf12c7c65 /chromeos/dbus/bluetooth_profile_service_provider.cc
parentf691be3b1bbbfb491e9afd283fe100acda894147 (diff)
downloadchromium_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_profile_service_provider.cc')
-rw-r--r--chromeos/dbus/bluetooth_profile_service_provider.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/dbus/bluetooth_profile_service_provider.cc b/chromeos/dbus/bluetooth_profile_service_provider.cc
index 1d9f2b5..960ddfb 100644
--- a/chromeos/dbus/bluetooth_profile_service_provider.cc
+++ b/chromeos/dbus/bluetooth_profile_service_provider.cc
@@ -252,7 +252,7 @@ BluetoothProfileServiceProvider* BluetoothProfileServiceProvider::Create(
dbus::Bus* bus,
const dbus::ObjectPath& object_path,
Delegate* delegate) {
- if (!DBusThreadManager::IsUsingStub(DBusClientBundle::BLUETOOTH)) {
+ if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
return new BluetoothProfileServiceProviderImpl(bus, object_path, delegate);
} else {
return new FakeBluetoothProfileServiceProvider(object_path, delegate);