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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/dbus_client_bundle.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/dbus/dbus_client.h ('k') | chromeos/dbus/dbus_client_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/dbus_client_bundle.h
diff --git a/chromeos/dbus/dbus_client_bundle.h b/chromeos/dbus/dbus_client_bundle.h
index 9d5d22d855db6b9aa40d11c11d9a8340c01faf86..bd23ca7c36a327a85f8ca905f5450fa03546c9cf 100644
--- a/chromeos/dbus/dbus_client_bundle.h
+++ b/chromeos/dbus/dbus_client_bundle.h
@@ -79,8 +79,8 @@ class CHROMEOS_EXPORT DBusClientBundle {
ALL_CLIENTS = ~static_cast<DBusClientTypeMask>(0),
};
+ ~DBusClientBundle();
hashimoto 2014/08/26 01:54:59 nit: dtor should come after the ctor.
zel 2014/08/26 17:50:45 Done.
zel 2014/08/26 17:50:45 Done.
zel 2014/08/26 17:50:45 Done.
DBusClientBundle();
- virtual ~DBusClientBundle();
// Initialize proper runtime environment for its dbus clients.
void SetupDefaultEnvironment();
@@ -230,6 +230,8 @@ class CHROMEOS_EXPORT DBusClientBundle {
}
private:
+ friend class DBusThreadManagerSetter;
+
scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
« chrome/browser/chromeos/policy/device_policy_cros_browser_test.h ('K') | « chromeos/dbus/dbus_client.h ('k') | chromeos/dbus/dbus_client_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698