| Index: dbus/scoped_dbus_error.h
|
| diff --git a/dbus/scoped_dbus_error.h b/dbus/scoped_dbus_error.h
|
| index c15c44397b91c59e21d871228b048f64c241ac55..1484dbb81b4b300dd6cd874287b07e7ff1b85271 100644
|
| --- a/dbus/scoped_dbus_error.h
|
| +++ b/dbus/scoped_dbus_error.h
|
| @@ -7,21 +7,20 @@
|
|
|
| #include <dbus/dbus.h>
|
|
|
| +#include "dbus/dbus_export.h"
|
| +
|
| namespace dbus {
|
|
|
| // Utility class to ensure that DBusError is freed.
|
| -class ScopedDBusError {
|
| +class CHROME_DBUS_EXPORT ScopedDBusError {
|
| public:
|
| - ScopedDBusError() {
|
| - dbus_error_init(&error_);
|
| - }
|
| -
|
| - ~ScopedDBusError() {
|
| - dbus_error_free(&error_);
|
| - }
|
| + // Do not inline methods that call dbus_error_xxx() functions.
|
| + // See http://crbug.com/416628
|
| + ScopedDBusError();
|
| + ~ScopedDBusError();
|
|
|
| DBusError* get() { return &error_; }
|
| - bool is_set() const { return dbus_error_is_set(&error_); }
|
| + bool is_set() const;
|
| const char* name() { return error_.name; }
|
| const char* message() { return error_.message; }
|
|
|
|
|