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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/dbus_client.h

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« chrome/browser/chromeos/policy/device_policy_cros_browser_test.h ('K') | « chromeos/cryptohome/system_salt_getter_unittest.cc ('k') | chromeos/dbus/dbus_client_bundle.h » ('j') | chromeos/dbus/dbus_client_bundle.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/dbus_client.h
diff --git a/chromeos/dbus/dbus_client.h b/chromeos/dbus/dbus_client.h
index e166c5f7fda1104456af771c9d7e1a16bd60231e..e05c6678c3f2a46f154a2804200eb460e008cb5d 100644
--- a/chromeos/dbus/dbus_client.h
+++ b/chromeos/dbus/dbus_client.h
@@ -18,8 +18,6 @@ namespace chromeos {
// incorrect calls. Stub clients may lift that restriction however.
class DBusClient {
protected:
- friend class DBusThreadManager;
-
virtual ~DBusClient() {}
// This function is called by DBusThreadManager. Only in unit tests, which
@@ -28,6 +26,8 @@ class DBusClient {
virtual void Init(dbus::Bus* bus) = 0;
private:
+ friend class DBusThreadManager;
+
DISALLOW_ASSIGN(DBusClient);
};
« chrome/browser/chromeos/policy/device_policy_cros_browser_test.h ('K') | « chromeos/cryptohome/system_salt_getter_unittest.cc ('k') | chromeos/dbus/dbus_client_bundle.h » ('j') | chromeos/dbus/dbus_client_bundle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698