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

Unified Diff: dbus/bus.cc

Issue 11266020: dbus: Reuse is_set() function from ScopedDBusError API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « no previous file | dbus/scoped_dbus_error.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/bus.cc
diff --git a/dbus/bus.cc b/dbus/bus.cc
index 73122c29dc38563e4c44fcc7eef9059538d7a751..988a7c1f9c0ac60fd25b7d9e7db67f5c3803f397 100644
--- a/dbus/bus.cc
+++ b/dbus/bus.cc
@@ -305,7 +305,7 @@ bool Bus::Connect() {
}
if (!connection_) {
LOG(ERROR) << "Failed to connect to the bus: "
- << (dbus_error_is_set(error.get()) ? error.message() : "");
+ << (error.is_set() ? error.message() : "");
return false;
}
// We shouldn't exit on the disconnected signal.
@@ -429,7 +429,7 @@ bool Bus::RequestOwnershipAndBlock(const std::string& service_name) {
error.get());
if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
LOG(ERROR) << "Failed to get the ownership of " << service_name << ": "
- << (dbus_error_is_set(error.get()) ? error.message() : "");
+ << (error.is_set() ? error.message() : "");
return false;
}
owned_service_names_.insert(service_name);
« no previous file with comments | « no previous file | dbus/scoped_dbus_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698