summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-04 01:16:18 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-04 01:16:18 +0000
commit6c67e618a8441a027d9db1456a89236800c54556 (patch)
tree6fedbf7941deab69e2107a9e647a6419b87a44e7 /chromeos
parent4ebaa632801c1cae44703b537eaec8770144d9e4 (diff)
downloadchromium_src-6c67e618a8441a027d9db1456a89236800c54556.zip
chromium_src-6c67e618a8441a027d9db1456a89236800c54556.tar.gz
chromium_src-6c67e618a8441a027d9db1456a89236800c54556.tar.bz2
chromeos: Remove references to UnlockScreenFailed signal.
This looks like it was initially added to handle D-Bus signals emitted by powerd when we failed to unlock the screen for some reason, but there are no references to the signal in either the power manager or session manager source now, and I can't find any code in Chrome to emit the signal either. Code Search doesn't show any references to "UnlockScreenFailed" outside of the chromium tree and system_api. BUG=chromium-os:24003 TEST=manual: still able to lock and unlock the screen; automatic locking on suspend works too Review URL: https://chromiumcodereview.appspot.com/10703081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/power_manager_client.cc11
-rw-r--r--chromeos/dbus/power_manager_client.h3
2 files changed, 0 insertions, 14 deletions
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 5c712fd..6c279fe 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -114,13 +114,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
weak_ptr_factory_.GetWeakPtr()),
base::Bind(&PowerManagerClientImpl::SignalConnected,
weak_ptr_factory_.GetWeakPtr()));
- session_manager_proxy_->ConnectToSignal(
- chromium::kChromiumInterface,
- chromium::kUnlockScreenFailedSignal,
- base::Bind(&PowerManagerClientImpl::ScreenUnlockFailedSignalReceived,
- weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&PowerManagerClientImpl::SignalConnected,
- weak_ptr_factory_.GetWeakPtr()));
power_manager_proxy_->ConnectToSignal(
power_manager::kPowerManagerInterface,
@@ -587,10 +580,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
}
- void ScreenUnlockFailedSignalReceived(dbus::Signal* signal) {
- FOR_EACH_OBSERVER(Observer, observers_, UnlockScreenFailed());
- }
-
void IdleNotifySignalReceived(dbus::Signal* signal) {
dbus::MessageReader reader(signal);
int64 threshold = 0;
diff --git a/chromeos/dbus/power_manager_client.h b/chromeos/dbus/power_manager_client.h
index cced783..dcd9848 100644
--- a/chromeos/dbus/power_manager_client.h
+++ b/chromeos/dbus/power_manager_client.h
@@ -80,9 +80,6 @@ class CHROMEOS_EXPORT PowerManagerClient {
// Called when the screen is unlocked.
virtual void UnlockScreen() {}
- // Called when the screen fails to unlock.
- virtual void UnlockScreenFailed() {}
-
// Called when we go idle for threshold time.
virtual void IdleNotify(int64 threshold_secs) {}