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

Unified Diff: chrome/browser/chromeos/login/screen_locker.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
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 d32f2ac2855f92385f8a34f6d881e670dd7a65be..feb1e613c1e95a0f8c9c73fa3295b8374d30cd43 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -118,11 +118,6 @@ class ScreenLockObserver : public chromeos::SessionManagerClient::Observer,
}
}
- virtual void UnlockScreen() OVERRIDE {
- VLOG(1) << "Received UnlockScreen D-Bus signal from session manager";
- chromeos::ScreenLocker::Hide();
- }
-
virtual void OnUserAddingFinished() OVERRIDE {
chromeos::UserAddingScreen::Get()->RemoveObserver(this);
LockScreen();
@@ -259,9 +254,6 @@ void ScreenLocker::UnlockOnLoginSuccess() {
return;
}
- VLOG(1) << "Calling session manager's UnlockScreen D-Bus method";
- DBusThreadManager::Get()->GetSessionManagerClient()->RequestUnlockScreen();
-
if (login_status_consumer_) {
login_status_consumer_->OnLoginSuccess(
UserContext(authentication_capture_->username,
@@ -272,6 +264,9 @@ void ScreenLocker::UnlockOnLoginSuccess() {
}
authentication_capture_.reset();
weak_factory_.InvalidateWeakPtrs();
+
+ VLOG(1) << "Hiding the lock screen.";
+ chromeos::ScreenLocker::Hide();
}
void ScreenLocker::Authenticate(const UserContext& user_context) {
@@ -381,10 +376,9 @@ void ScreenLocker::ScheduleDeletion() {
// Avoid possible multiple calls.
if (screen_locker_ == NULL)
return;
- VLOG(1) << "Posting task to delete ScreenLocker " << screen_locker_;
- ScreenLocker* screen_locker = screen_locker_;
+ VLOG(1) << "Deleting ScreenLocker " << screen_locker_;
+ delete screen_locker_;
screen_locker_ = NULL;
- base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, screen_locker);
}
// static
@@ -457,4 +451,3 @@ bool ScreenLocker::IsUserLoggedIn(const std::string& username) {
}
} // namespace chromeos
-
« no previous file with comments | « chrome/browser/chromeos/enterprise_extension_observer.cc ('k') | chrome/browser/chromeos/login/screen_locker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698