Revert "chromeos: move screen lock handling to power manager client"

chrome/browser/chromeos/login/screen_locker.cc

 // Copyright (c) 2011 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"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_performer.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_locker_views.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 16 matching lines @@
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 // Observer to start ScreenLocker when the screen lock
-class ScreenLockObserver : public chromeos::PowerManagerClient::Observer,
+class ScreenLockObserver : public chromeos::ScreenLockLibrary::Observer,
                            public content::NotificationObserver {
  public:
   ScreenLockObserver() {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
   }
 
   // NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE {
     if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
       // Register Screen Lock after login screen to make sure
       // we don't show the screen lock on top of the login screen by accident.
-      chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
-          AddObserver(this);
+      chromeos::CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
     }
   }
 
-  virtual void LockScreen() OVERRIDE {
+  virtual void LockScreen(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     VLOG(1) << "In: ScreenLockObserver::LockScreen";
     SetupInputMethodsForScreenLocker();
     chromeos::ScreenLocker::Show();
   }
 
-  virtual void UnlockScreen() OVERRIDE {
+  virtual void UnlockScreen(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     RestoreInputMethods();
     chromeos::ScreenLocker::Hide();
   }
 
-  virtual void UnlockScreenFailed() OVERRIDE {
+  virtual void UnlockScreenFailed(chromeos::ScreenLockLibrary* obj) OVERRIDE {
     chromeos::ScreenLocker::UnlockScreenFailed();
   }
 
  private:
   // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic)
   // since they are not necessary to input a login password. Users are still
   // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak,
   // French).
   void SetupInputMethodsForScreenLocker() {
     if (// The LockScreen function is also called when the OS is suspended, and
@@ skipping 165 matching lines @@
   }
 
   Profile* profile = ProfileManager::GetDefaultProfile();
   if (profile) {
     ProfileSyncService* service = profile->GetProfileSyncService(username);
     if (service && !service->HasSyncSetupCompleted()) {
       // If sync has failed somehow, try setting the sync passphrase here.
       service->SetPassphrase(password, false);
     }
   }
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenUnlockRequested();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockRequested();
 
   if (login_status_consumer_)
     login_status_consumer_->OnLoginSuccess(username, password,
                                            unused, pending_requests,
                                            using_oauth);
 }
 
 void ScreenLocker::Authenticate(const string16& password) {
   authentication_start_time_ = base::Time::Now();
   delegate_->SetInputEnabled(false);
@@ skipping 70 matching lines @@
   if (!screen_locker_) {
     VLOG(1) << "Show: Locking screen";
     ScreenLocker* locker =
         new ScreenLocker(UserManager::Get()->logged_in_user());
     locker->Init();
   } else {
     // PowerManager re-sends lock screen signal if it doesn't
     // receive the response within timeout. Just send complete
     // signal.
     VLOG(1) << "Show: locker already exists. Just sending completion event.";
-    DBusThreadManager::Get()->GetPowerManagerClient()->
-        NotifyScreenLockCompleted();
+    CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
   }
 }
 
 // static
 void ScreenLocker::Hide() {
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
   DCHECK(screen_locker_);
   VLOG(1) << "Hide: Deleting ScreenLocker: " << screen_locker_;
   MessageLoopForUI::current()->DeleteSoon(FROM_HERE, screen_locker_);
 }
@@ skipping 33 matching lines @@
 ScreenLocker::~ScreenLocker() {
   DCHECK(MessageLoop::current()->type() == MessageLoop::TYPE_UI);
   ClearErrors();
 
   screen_locker_ = NULL;
   bool state = false;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
-  DBusThreadManager::Get()->GetPowerManagerClient()->
-      NotifyScreenUnlockCompleted();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenUnlockCompleted();
 }
 
 void ScreenLocker::SetAuthenticator(Authenticator* authenticator) {
   authenticator_ = authenticator;
 }
 
 void ScreenLocker::ScreenLockReady() {
   VLOG(1) << "ScreenLockReady: sending completed signal to power manager.";
   locked_ = true;
   base::TimeDelta delta = base::Time::Now() - start_time_;
   VLOG(1) << "Screen lock time: " << delta.InSecondsF();
   UMA_HISTOGRAM_TIMES("ScreenLocker.ScreenLockTime", delta);
 
   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();
+  CrosLibrary::Get()->GetScreenLockLibrary()->NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos