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

Unified Diff: chromeos/dbus/session_manager_client.cc

Issue 23694025: Remove calls to deprecated session_manager DBus methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix use-after-free in tests. Created 7 years, 3 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
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/session_manager_client.cc
diff --git a/chromeos/dbus/session_manager_client.cc b/chromeos/dbus/session_manager_client.cc
index f75a9d4e73120b2fedf224ea3b54fa1981d21236..b49fca3a43ab2f3630e9f8ac0d5a7f16c8f050c4 100644
--- a/chromeos/dbus/session_manager_client.cc
+++ b/chromeos/dbus/session_manager_client.cc
@@ -71,10 +71,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
weak_ptr_factory_.GetWeakPtr()));
}
- virtual void RestartEntd() OVERRIDE {
- SimpleMethodCallToSessionManager(login_manager::kSessionManagerRestartEntd);
- }
-
virtual void StartSession(const std::string& user_email) OVERRIDE {
dbus::MethodCall method_call(login_manager::kSessionManagerInterface,
login_manager::kSessionManagerStartSession);
@@ -119,11 +115,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
login_manager::kSessionManagerHandleLockScreenShown);
}
- virtual void RequestUnlockScreen() OVERRIDE {
- SimpleMethodCallToSessionManager(
- login_manager::kSessionManagerUnlockScreen);
- }
-
virtual void NotifyLockScreenDismissed() OVERRIDE {
SimpleMethodCallToSessionManager(
login_manager::kSessionManagerHandleLockScreenDismissed);
@@ -276,13 +267,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
weak_ptr_factory_.GetWeakPtr()));
session_manager_proxy_->ConnectToSignal(
chromium::kChromiumInterface,
- chromium::kUnlockScreenSignal,
- base::Bind(&SessionManagerClientImpl::ScreenUnlockReceived,
- weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&SessionManagerClientImpl::SignalConnected,
- weak_ptr_factory_.GetWeakPtr()));
- session_manager_proxy_->ConnectToSignal(
- chromium::kChromiumInterface,
chromium::kLivenessRequestedSignal,
base::Bind(&SessionManagerClientImpl::LivenessRequestedReceived,
weak_ptr_factory_.GetWeakPtr()),
@@ -494,10 +478,6 @@ class SessionManagerClientImpl : public SessionManagerClient {
FOR_EACH_OBSERVER(Observer, observers_, LockScreen());
}
- void ScreenUnlockReceived(dbus::Signal* signal) {
- FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
- }
-
void LivenessRequestedReceived(dbus::Signal* signal) {
SimpleMethodCallToSessionManager(
login_manager::kSessionManagerHandleLivenessConfirmed);
@@ -562,7 +542,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
virtual void EmitLoginPromptReady() OVERRIDE {}
virtual void EmitLoginPromptVisible() OVERRIDE {}
virtual void RestartJob(int pid, const std::string& command_line) OVERRIDE {}
- virtual void RestartEntd() OVERRIDE {}
virtual void StartSession(const std::string& user_email) OVERRIDE {}
virtual void StopSession() OVERRIDE {}
virtual void StartDeviceWipe() OVERRIDE {}
@@ -572,9 +551,6 @@ class SessionManagerClientStubImpl : public SessionManagerClient {
virtual void NotifyLockScreenShown() OVERRIDE {
FOR_EACH_OBSERVER(Observer, observers_, ScreenIsLocked());
}
- virtual void RequestUnlockScreen() OVERRIDE {
- FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
- }
virtual void NotifyLockScreenDismissed() OVERRIDE {
FOR_EACH_OBSERVER(Observer, observers_, ScreenIsUnlocked());
}
« no previous file with comments | « chromeos/dbus/session_manager_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698