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

Unified Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 10703081: chromeos: Remove references to UnlockScreenFailed signal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/login/screen_locker.cc
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index cc191566bbba358ed6ceaae92770540edd4d9414..25c2381783a4f5f3baf39d2773fa45c145cbc101 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -103,10 +103,6 @@ class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
chromeos::ScreenLocker::Hide();
}
- virtual void UnlockScreenFailed() OVERRIDE {
- chromeos::ScreenLocker::UnlockScreenFailed();
- }
-
private:
bool session_started_;
content::NotificationRegistrar registrar_;
@@ -315,24 +311,6 @@ void ScreenLocker::Hide() {
}
// static
-void ScreenLocker::UnlockScreenFailed() {
- DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
- if (screen_locker_) {
- // Power manager decided no to unlock the screen even if a user
- // typed in password, for example, when a user closed the lid
- // immediately after typing in the password.
- VLOG(1) << "UnlockScreenFailed: re-enabling screen locker.";
- screen_locker_->EnableInput();
- } else {
- // This can happen when a user requested unlock, but PowerManager
- // rejected because the computer is closed, then PowerManager unlocked
- // because it's open again and the above failure message arrives.
- // This'd be extremely rare, but may still happen.
- VLOG(1) << "UnlockScreenFailed: screen is already unlocked.";
- }
-}
-
-// static
void ScreenLocker::InitClass() {
g_screen_lock_observer.Get();
}
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698