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

Unified Diff: chromeos/dbus/nfc_manager_client.cc

Issue 2238703002: chromeos: Avoid org.neard.Manager D-Bus log spam. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oh, gmock Created 4 years, 4 months 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
« no previous file with comments | « chromeos/dbus/nfc_client_unittest.cc ('k') | dbus/mock_object_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/nfc_manager_client.cc
diff --git a/chromeos/dbus/nfc_manager_client.cc b/chromeos/dbus/nfc_manager_client.cc
index 4536b53f2c803c5d9246e0daa9c702eeb8e0e718..d9662822cb1715d7e5a388b223b80cb54112423a 100644
--- a/chromeos/dbus/nfc_manager_client.cc
+++ b/chromeos/dbus/nfc_manager_client.cc
@@ -70,7 +70,6 @@ class NfcManagerClientImpl : public NfcManagerClient {
weak_ptr_factory_.GetWeakPtr()),
base::Bind(&NfcManagerClientImpl::AdapterAddedConnected,
weak_ptr_factory_.GetWeakPtr()));
-
object_proxy_->ConnectToSignal(
nfc_manager::kNfcManagerInterface,
nfc_manager::kAdapterRemovedSignal,
@@ -84,12 +83,23 @@ class NfcManagerClientImpl : public NfcManagerClient {
object_proxy_,
base::Bind(&NfcManagerClientImpl::OnPropertyChanged,
weak_ptr_factory_.GetWeakPtr())));
-
properties_->ConnectSignals();
- properties_->GetAll();
+
+ object_proxy_->WaitForServiceToBeAvailable(
+ base::Bind(&NfcManagerClientImpl::OnServiceInitiallyAvailable,
+ weak_ptr_factory_.GetWeakPtr()));
}
private:
+ // Called by |object_proxy_| when the D-Bus service initially becomes
+ // available.
+ void OnServiceInitiallyAvailable(bool service_is_available) {
+ if (service_is_available)
+ properties_->GetAll();
+ else
+ LOG(ERROR) << "Failed to wait for D-Bus service to become available";
+ }
+
// NFC manager signal handlers.
void OnPropertyChanged(const std::string& property_name) {
VLOG(1) << "NFC Manager property changed: " << property_name;
@@ -97,7 +107,7 @@ class NfcManagerClientImpl : public NfcManagerClient {
ManagerPropertyChanged(property_name));
}
- // Called by dbus:: when an "AdapterAdded" signal is received..
+ // Called by dbus:: when an "AdapterAdded" signal is received.
void AdapterAddedReceived(dbus::Signal* signal) {
DCHECK(signal);
dbus::MessageReader reader(signal);
« no previous file with comments | « chromeos/dbus/nfc_client_unittest.cc ('k') | dbus/mock_object_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698