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

Unified Diff: chrome/browser/chromeos/power/login_lock_state_notifier.cc

Issue 2801333002: mash: Run pre-unlock animation via SessionController (Closed)
Patch Set: rebase Created 3 years, 8 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/power/login_lock_state_notifier.cc
diff --git a/chrome/browser/chromeos/power/login_lock_state_notifier.cc b/chrome/browser/chromeos/power/login_lock_state_notifier.cc
index f5a0022c2e12e5bdbaeb63e47d6967e40357aa82..0c47a5c1ec9f4fea547377e654ccbdd4f22ddc12 100644
--- a/chrome/browser/chromeos/power/login_lock_state_notifier.cc
+++ b/chrome/browser/chromeos/power/login_lock_state_notifier.cc
@@ -7,7 +7,6 @@
#include "ash/shell.h"
#include "base/logging.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "content/public/browser/notification_service.h"
namespace ash {
@@ -19,12 +18,6 @@ namespace chromeos {
LoginLockStateNotifier::LoginLockStateNotifier() {
registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING,
content::NotificationService::AllSources());
- registrar_.Add(this, chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
- content::NotificationService::AllSources());
-
- const ScreenLocker* locker = ScreenLocker::default_screen_locker();
- bool locked = locker && locker->locked();
- ash::Shell::Get()->OnLockStateChanged(locked);
}
LoginLockStateNotifier::~LoginLockStateNotifier() {}
@@ -37,11 +30,6 @@ void LoginLockStateNotifier::Observe(
case chrome::NOTIFICATION_APP_TERMINATING:
ash::Shell::Get()->OnAppTerminating();
break;
- case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
- bool locked = *content::Details<bool>(details).ptr();
- ash::Shell::Get()->OnLockStateChanged(locked);
- break;
- }
default:
NOTREACHED() << "Unexpected notification " << type;
}

Powered by Google App Engine
This is Rietveld 408576698