diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:47:18 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 20:47:18 +0000 |
| commit | 8a3a8d6b5fe7e159accdcecb96f18de4959aef80 (patch) | |
| tree | 9cfec657b31f14d38f95d3b30eb54f4bc14f1985 /dbus | |
| parent | fc0becbd8df39fcdfa28957401e9c76788d6560d (diff) | |
| download | chromium_src-8a3a8d6b5fe7e159accdcecb96f18de4959aef80.zip chromium_src-8a3a8d6b5fe7e159accdcecb96f18de4959aef80.tar.gz chromium_src-8a3a8d6b5fe7e159accdcecb96f18de4959aef80.tar.bz2 | |
DBus: Reverse error suppression logic from r198328.
BUG=181064
Review URL: https://chromiumcodereview.appspot.com/14660017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/bus.cc | 2 | ||||
| -rw-r--r-- | dbus/object_proxy.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dbus/bus.cc b/dbus/bus.cc index fafacd3..0c8772b 100644 --- a/dbus/bus.cc +++ b/dbus/bus.cc @@ -904,7 +904,7 @@ void Bus::GetServiceOwnerInternal(const std::string& service_name, std::string service_owner; if (Connect()) - service_owner = GetServiceOwnerAndBlock(service_name, REPORT_ERRORS); + service_owner = GetServiceOwnerAndBlock(service_name, SUPPRESS_ERRORS); PostTaskToOriginThread(FROM_HERE, base::Bind(callback, service_owner)); } diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index 53b3539..d7012ad 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc @@ -613,7 +613,7 @@ bool ObjectProxy::AddMatchRuleWithoutCallback( void ObjectProxy::UpdateNameOwnerAndBlock() { bus_->AssertOnDBusThread(); service_name_owner_ = - bus_->GetServiceOwnerAndBlock(service_name_, Bus::SUPPRESS_ERRORS); + bus_->GetServiceOwnerAndBlock(service_name_, Bus::REPORT_ERRORS); } DBusHandlerResult ObjectProxy::HandleNameOwnerChanged( |