diff options
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index 21794b5..b98e07c 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -404,8 +404,11 @@ class DBusThreadManagerImpl : public DBusThreadManager { scoped_ptr<ImageBurnerClient> image_burner_client_; scoped_ptr<IntrospectableClient> introspectable_client_; scoped_ptr<ModemMessagingClient> modem_messaging_client_; - scoped_ptr<NfcAdapterClient> nfc_adapter_client_; + // NfcAdapterClient depends on NfcManagerClient. We declare NfcManagerClient + // first, so that it won't be deallocated before NfcAdapterClient is done + // cleaning up. scoped_ptr<NfcManagerClient> nfc_manager_client_; + scoped_ptr<NfcAdapterClient> nfc_adapter_client_; scoped_ptr<PermissionBrokerClient> permission_broker_client_; scoped_ptr<SystemClockClient> system_clock_client_; scoped_ptr<PowerManagerClient> power_manager_client_; |