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

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

Issue 10693087: chromeos: Request screen lock directly from session manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove locking-related metrics code Created 8 years, 5 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/login_performer.cc
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index 5a77afc3003b57a5b075a355e7b5bbf27b49ae11..cb0e689067bef0c069d23a727e6715a921beea7a 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -28,7 +28,7 @@
#include "chrome/common/net/gaia/gaia_auth_util.h"
#include "chrome/common/pref_names.h"
#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/power_manager_client.h"
+#include "chromeos/dbus/session_manager_client.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
@@ -386,16 +386,14 @@ void LoginPerformer::RequestScreenLock() {
ResolveScreenLocked();
} else {
screen_lock_requested_ = true;
- DBusThreadManager::Get()->GetPowerManagerClient()->
- NotifyScreenLockRequested();
+ DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();
}
}
void LoginPerformer::RequestScreenUnlock() {
DVLOG(1) << "Screen unlock requested";
if (ScreenLocker::default_screen_locker()) {
- DBusThreadManager::Get()->GetPowerManagerClient()->
- NotifyScreenUnlockRequested();
+ DBusThreadManager::Get()->GetSessionManagerClient()->RequestUnlockScreen();
// Will unsubscribe from notifications once unlock is successful.
} else {
LOG(ERROR) << "Screen is not locked";
« no previous file with comments | « chrome/browser/automation/testing_automation_provider_chromeos.cc ('k') | chrome/browser/chromeos/login/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698