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

chrome/browser/chromeos/accessibility/system_event_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_SYSTEM_EVENT_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_SYSTEM_EVENT_OBSERVER_H_
 #pragma once
 
+#include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
 namespace accessibility {
 
 // A singleton class to observe system events like wake up from sleep and
 // screen unlock.
-class SystemEventObserver : public PowerManagerClient::Observer {
+class SystemEventObserver : public PowerManagerClient::Observer,
+                            public ScreenLockLibrary::Observer {
  public:
   virtual ~SystemEventObserver();
 
   // PowerManagerClient::Observer override.
   virtual void SystemResumed() OVERRIDE;
 
   // ScreenLockLibrary::Observer override.
-  virtual void LockScreen() OVERRIDE;
+  virtual void LockScreen(ScreenLockLibrary* screen_lock_library) OVERRIDE;
 
   // ScreenLockLibrary::Observer override.
-  virtual void UnlockScreen() OVERRIDE;
+  virtual void UnlockScreen(ScreenLockLibrary* screen_lock_library) OVERRIDE;
 
   // ScreenLockLibrary::Observer override.
-  virtual void UnlockScreenFailed() OVERRIDE;
+  virtual void UnlockScreenFailed(ScreenLockLibrary* screen_lock_library)
+      OVERRIDE;
 
   // Creates the global SystemEventObserver instance.
   static void Initialize();
 
   // Returns a pointer to the global SystemEventObserver instance.
   // Initialize() should already have been called.
   static SystemEventObserver* GetInstance();
 
   // Destroys the global SystemEventObserver Instance.
   static void Shutdown();
 
  private:
   SystemEventObserver();
 
   DISALLOW_COPY_AND_ASSIGN(SystemEventObserver);
 };
 
 }  // namespace accessibility
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_ACCESSIBILITY_SYSTEM_EVENT_OBSERVER_H_