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

Unified Diff: dbus/object_proxy.h

Issue 7714030: Add mock classes for Bus, ObjectProxy, and ExportedObject. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang build Created 9 years, 4 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
« dbus/mock_bus.h ('K') | « dbus/mock_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/object_proxy.h
diff --git a/dbus/object_proxy.h b/dbus/object_proxy.h
index ae9bd9a33ac2ac9b15db74a58a03b328a31ff269..f75e33018a60f16a784b11490934d7c1011261dd 100644
--- a/dbus/object_proxy.h
+++ b/dbus/object_proxy.h
@@ -6,6 +6,7 @@
#define DBUS_OBJECT_PROXY_H_
#pragma once
+#include <map>
#include <string>
#include <vector>
#include <dbus/dbus.h>
@@ -104,9 +105,12 @@ class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
// BLOCKING CALL.
virtual void Detach();
+ protected:
+ // This is protected, so we can define sub classes.
+ virtual ~ObjectProxy();
+
private:
friend class base::RefCountedThreadSafe<ObjectProxy>;
- virtual ~ObjectProxy();
// Struct of data we'll be passing from StartAsyncMethodCall() to
// OnPendingCallIsCompleteThunk().
« dbus/mock_bus.h ('K') | « dbus/mock_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698