diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 07:26:34 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 07:26:34 +0000 |
commit | ea78b1e8f6004bab26387cdd2a6bff6ccf108de6 (patch) | |
tree | d0ff8009b98d1db53852c85e6ecec3c307b46db2 /dbus/bus.h | |
parent | e2dcc6bf7ba98799e0e289505dd685889dd5ccb2 (diff) | |
download | chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.zip chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.tar.gz chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.tar.bz2 |
Minor cleanups and improvements for the D-Bus library.
- Add mock_export_object.{cc,h} to dbus.gyp, which were missing.
- Add a comment about shutdown of Bus in bus.h.
- Update mock_unittest.cc to call ShutdownAndBlock().
- Replace DCHECKs with LOG(ERROR)s followed by early exit.
- Add virtual to SetUp() and TearDown() in tests.
- Renamed a member variable to make it clearer.
BUG=chromium:90036
TEST=dbus_unittests
Review URL: http://codereview.chromium.org/7745044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/bus.h')
-rw-r--r-- | dbus/bus.h | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -59,6 +59,12 @@ class ObjectProxy; // call). To err on the safe side, we consider all libdbus functions that // deal with the connection to dbus-damoen to be blocking. // +// SHUTDOWN +// +// The Bus object must be shut down manually by Shutdown() or +// ShutdownAndBlock(). We require the manual shutdown as we should not +// issue blocking calls in the destructor. +// // EXAMPLE USAGE: // // Synchronous method call: @@ -448,7 +454,7 @@ class Bus : public base::RefCountedThreadSafe<Bus> { scoped_refptr<dbus::ExportedObject> > ExportedObjectTable; ExportedObjectTable exported_object_table_; - bool async_operations_are_set_up_; + bool async_operations_set_up_; // Counters to make sure that OnAddWatch()/OnRemoveWatch() and // OnAddTimeout()/OnRemoveTimeou() are balanced. |