| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef DBUS_OBJECT_PROXY_H_ | 5 #ifndef DBUS_OBJECT_PROXY_H_ |
| 6 #define DBUS_OBJECT_PROXY_H_ | 6 #define DBUS_OBJECT_PROXY_H_ |
| 7 | 7 |
| 8 #include <dbus/dbus.h> | 8 #include <dbus/dbus.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 public: | 39 public: |
| 40 // Client code should use Bus::GetObjectProxy() or | 40 // Client code should use Bus::GetObjectProxy() or |
| 41 // Bus::GetObjectProxyWithOptions() instead of this constructor. | 41 // Bus::GetObjectProxyWithOptions() instead of this constructor. |
| 42 ObjectProxy(Bus* bus, | 42 ObjectProxy(Bus* bus, |
| 43 const std::string& service_name, | 43 const std::string& service_name, |
| 44 const ObjectPath& object_path, | 44 const ObjectPath& object_path, |
| 45 int options); | 45 int options); |
| 46 | 46 |
| 47 // Options to be OR-ed together when calling Bus::GetObjectProxyWithOptions(). | 47 // Options to be OR-ed together when calling Bus::GetObjectProxyWithOptions(). |
| 48 // Set the IGNORE_SERVICE_UNKNOWN_ERRORS option to silence logging of | 48 // Set the IGNORE_SERVICE_UNKNOWN_ERRORS option to silence logging of |
| 49 // org.freedesktop.DBus.Error.ServiceUnknown errors. | 49 // org.freedesktop.DBus.Error.ServiceUnknown errors and |
| 50 // org.freedesktop.DBus.Error.ObjectUnknown errors. |
| 50 enum Options { | 51 enum Options { |
| 51 DEFAULT_OPTIONS = 0, | 52 DEFAULT_OPTIONS = 0, |
| 52 IGNORE_SERVICE_UNKNOWN_ERRORS = 1 << 0 | 53 IGNORE_SERVICE_UNKNOWN_ERRORS = 1 << 0 |
| 53 }; | 54 }; |
| 54 | 55 |
| 55 // Special timeout constants. | 56 // Special timeout constants. |
| 56 // | 57 // |
| 57 // The constants correspond to DBUS_TIMEOUT_USE_DEFAULT and | 58 // The constants correspond to DBUS_TIMEOUT_USE_DEFAULT and |
| 58 // DBUS_TIMEOUT_INFINITE. Here we use literal numbers instead of these | 59 // DBUS_TIMEOUT_INFINITE. Here we use literal numbers instead of these |
| 59 // macros as these aren't defined with D-Bus earlier than 1.4.12. | 60 // macros as these aren't defined with D-Bus earlier than 1.4.12. |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 307 |
| 307 // Known name owner of the well-known bus name represnted by |service_name_|. | 308 // Known name owner of the well-known bus name represnted by |service_name_|. |
| 308 std::string service_name_owner_; | 309 std::string service_name_owner_; |
| 309 | 310 |
| 310 DISALLOW_COPY_AND_ASSIGN(ObjectProxy); | 311 DISALLOW_COPY_AND_ASSIGN(ObjectProxy); |
| 311 }; | 312 }; |
| 312 | 313 |
| 313 } // namespace dbus | 314 } // namespace dbus |
| 314 | 315 |
| 315 #endif // DBUS_OBJECT_PROXY_H_ | 316 #endif // DBUS_OBJECT_PROXY_H_ |
| OLD | NEW |