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

Unified Diff: chrome/browser/chromeos/dbus/dbus_thread_manager.h

Issue 8289021: chromeos: Change all clients of LoginLibrary to use SessionManagerClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed Created 9 years, 2 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
Index: chrome/browser/chromeos/dbus/dbus_thread_manager.h
diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.h b/chrome/browser/chromeos/dbus/dbus_thread_manager.h
index 889778fb62f9c483c06956164c84abb3337848f3..ffdeb7cc707632e161e1efe577d5a45af104cef1 100644
--- a/chrome/browser/chromeos/dbus/dbus_thread_manager.h
+++ b/chrome/browser/chromeos/dbus/dbus_thread_manager.h
@@ -21,6 +21,7 @@ namespace chromeos {
class CrosDBusService;
class PowerManagerClient;
+class SessionManagerClient;
class SensorsSource;
// DBusThreadManager manages the D-Bus thread, the thread dedicated to
@@ -55,12 +56,23 @@ class DBusThreadManager {
static DBusThreadManager* Get();
// Returns the power manager client, owned by DBusThreadManager.
- // Do not cache this pointer and use it after DBusThreadManager is shut
- // down.
+ // See also comments at session_manager_client().
PowerManagerClient* power_manager_client() {
return power_manager_client_.get();
}
+ // Returns the session manager client, owned by DBusThreadManager.
+ // Do not cache this pointer and use it after DBusThreadManager is shut
+ // down.
+ SessionManagerClient* session_manager_client() {
+ return session_manager_client_.get();
+ }
+
+ // Sets the session manager client. Takes the ownership.
+ // The function is exported for testing.
+ void set_session_manager_client_for_testing(
+ SessionManagerClient* session_manager_client);
+
private:
DBusThreadManager();
virtual ~DBusThreadManager();
@@ -70,6 +82,7 @@ class DBusThreadManager {
CrosDBusService* cros_dbus_service_;
scoped_ptr<SensorsSource> sensors_source_;
scoped_ptr<PowerManagerClient> power_manager_client_;
+ scoped_ptr<SessionManagerClient> session_manager_client_;
DISALLOW_COPY_AND_ASSIGN(DBusThreadManager);
};
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/dbus/dbus_thread_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698