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

Unified Diff: dbus/bus.h

Issue 9373039: Allow dbus clients to silence logging when a service is unavailable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove string.h include Created 8 years, 10 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/bus.cc » ('j') | dbus/bus.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/bus.h
diff --git a/dbus/bus.h b/dbus/bus.h
index 4af07ce1089fc2585a3c0eb6ff5dd040458e8600..6b69a0fd8061f80b9f953eddc2ee76620ba4fac8 100644
--- a/dbus/bus.h
+++ b/dbus/bus.h
@@ -196,6 +196,13 @@ class Bus : public base::RefCountedThreadSafe<Bus> {
virtual ObjectProxy* GetObjectProxy(const std::string& service_name,
const std::string& object_path);
+ // Same as above, but also takes a bitfield of ObjectProxy::Options.
+ // See object_proxy.h for available options.
+ virtual ObjectProxy* GetObjectProxyWithOptions(
+ const std::string& service_name,
+ const std::string& object_path,
+ int options);
+
// Gets the exported object for the given service name and the object
// path. The caller must not delete the returned object.
//
@@ -468,6 +475,8 @@ class Bus : public base::RefCountedThreadSafe<Bus> {
// ExportedObjectTable is used to hold the exported objects created by
// the bus object. Key is a concatenated string of service name +
// object path, like "org.chromium.TestService/org/chromium/TestObject".
+ // If any ObjectProxy::Options were passed in, they are concatenated as an
+ // int to the end of the key.
satorux1 2012/02/10 18:09:01 This doesn't seem to be the right place. Move this
adamk 2012/02/10 19:28:21 Woops, this was meant to go above. I've updated t
typedef std::map<std::string,
scoped_refptr<dbus::ExportedObject> > ExportedObjectTable;
ExportedObjectTable exported_object_table_;
« no previous file with comments | « no previous file | dbus/bus.cc » ('j') | dbus/bus.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698