diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/dbus | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/dbus')
| -rw-r--r-- | chromium/dbus/object_proxy.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/dbus/object_proxy.cc b/chromium/dbus/object_proxy.cc index 95aab8956d4..ea76fd72f09 100644 --- a/chromium/dbus/object_proxy.cc +++ b/chromium/dbus/object_proxy.cc @@ -612,8 +612,12 @@ bool ObjectProxy::AddMatchRuleWithoutCallback( void ObjectProxy::UpdateNameOwnerAndBlock() { bus_->AssertOnDBusThread(); + // Errors should be suppressed here, as the service may not be yet running + // when connecting to signals of the service, which is just fine. + // The ObjectProxy will be notified when the service is launched via + // NameOwnerChanged signal. See also comments in ConnectToSignalInternal(). service_name_owner_ = - bus_->GetServiceOwnerAndBlock(service_name_, Bus::REPORT_ERRORS); + bus_->GetServiceOwnerAndBlock(service_name_, Bus::SUPPRESS_ERRORS); } DBusHandlerResult ObjectProxy::HandleNameOwnerChanged( |