chromeos: move screen lock handling to power manager client

chrome/browser/chromeos/accessibility/system_event_observer.cc

Index: chrome/browser/chromeos/accessibility/system_event_observer.cc
diff --git a/chrome/browser/chromeos/accessibility/system_event_observer.cc b/chrome/browser/chromeos/accessibility/system_event_observer.cc
index 85415b4a970b48dc862f18be10e4efc72007b48e..b8f287e6b0b90b591008f42bfb3b84d88fdf7e02 100644
--- a/chrome/browser/chromeos/accessibility/system_event_observer.cc
+++ b/chrome/browser/chromeos/accessibility/system_event_observer.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "chrome/browser/accessibility_events.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -21,11 +20,11 @@ SystemEventObserver* g_system_event_observer = NULL;
 }
 
 SystemEventObserver::SystemEventObserver() {
-  CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);

[hashimoto, 2011/11/29 02:58:31]

AddObserver is also called in Initialize.
Please remove one of them.

[Simon Que, 2011/11/29 23:31:24]

Done.

 }
 
 SystemEventObserver::~SystemEventObserver() {
-  CrosLibrary::Get()->GetScreenLockLibrary()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);

[hashimoto, 2011/11/29 02:58:31]

ditto.

[Simon Que, 2011/11/29 23:31:24]

Done.

 }
 
 void SystemEventObserver::SystemResumed() {
@@ -35,19 +34,16 @@ void SystemEventObserver::SystemResumed() {
       chrome::NOTIFICATION_ACCESSIBILITY_WOKE_UP, &info);
 }
 
-void SystemEventObserver::LockScreen(ScreenLockLibrary* screen_lock_library) {
-}
+void SystemEventObserver::LockScreen() {}
 
-void SystemEventObserver::UnlockScreen(ScreenLockLibrary* screen_lock_library) {
+void SystemEventObserver::UnlockScreen() {
   Profile* profile = ProfileManager::GetDefaultProfile();
   ScreenUnlockedEventInfo info(profile);
   SendAccessibilityNotification(
       chrome::NOTIFICATION_ACCESSIBILITY_SCREEN_UNLOCKED, &info);
 }
 
-void SystemEventObserver::UnlockScreenFailed(
-    ScreenLockLibrary* screen_lock_library) {
-}
+void SystemEventObserver::UnlockScreenFailed() {}
 
 // static
 void SystemEventObserver::Initialize() {