chromeos: Request screen lock directly from session manager.

chrome/browser/chromeos/login/screen_locker.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 31 matching lines @@
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace {
 
 // Observer to start ScreenLocker when the screen lock
-class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
+class ScreenLockObserver : public chromeos::SessionManagerClient::Observer,
                            public content::NotificationObserver {
  public:
   ScreenLockObserver() : session_started_(false) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_SESSION_STARTED,
                    content::NotificationService::AllSources());
   }
 
   // NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
         // Register Screen Lock only after a user has logged in.
-        chromeos::PowerManagerClient* power_manager =
-            chromeos::DBusThreadManager::Get()->GetPowerManagerClient();
-        if (!power_manager->HasObserver(this))
-          power_manager->AddObserver(this);
+        chromeos::SessionManagerClient* session_manager =
+            chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
+        if (!session_manager->HasObserver(this))
+          session_manager->AddObserver(this);
         break;
       }
 
       case chrome::NOTIFICATION_SESSION_STARTED: {
         session_started_ = true;
         break;
       }
 
       default:
         NOTREACHED();
@@ skipping 107 matching lines @@
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile);
     DCHECK(signin);
     GoogleServiceSigninSuccessDetails details(
         signin->GetAuthenticatedUsername(),
         password);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
         content::Source<Profile>(profile),
         content::Details<const GoogleServiceSigninSuccessDetails>(&details));
   }
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenUnlockRequested();
+  DBusThreadManager::Get()->GetSessionManagerClient()->RequestUnlockScreen();
 
   if (login_status_consumer_)
     login_status_consumer_->OnLoginSuccess(username, password, pending_requests,
                                            using_oauth);
 }
 
 void ScreenLocker::Authenticate(const string16& password) {
   authentication_start_time_ = base::Time::Now();
   delegate_->SetInputEnabled(false);
   delegate_->OnAuthenticate();
@@ skipping 65 matching lines @@
   if (browser && browser->window()->IsFullscreen()) {
     browser->ToggleFullscreenMode();
   }
 
   if (!screen_locker_) {
     DVLOG(1) << "Show: Locking screen";
     ScreenLocker* locker =
         new ScreenLocker(UserManager::Get()->GetLoggedInUser());
     locker->Init();
   } else {
-    // PowerManager re-sends lock screen signal if it doesn't
-    // receive the response within timeout. Just send complete
-    // signal.
     DVLOG(1) << "Show: locker already exists. Just sending completion event.";
     DBusThreadManager::Get()->GetPowerManagerClient()->
         NotifyScreenLockCompleted();
   }
 }
 
 // static
 void ScreenLocker::Hide() {
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
   // For a guest/demo user, screen_locker_ would have never been initialized.
@@ skipping 44 matching lines @@
   bool state = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
   DBusThreadManager::Get()->GetPowerManagerClient()->
       NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos