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

Unified Diff: chrome/browser/chromeos/accessibility/system_event_observer.cc

Issue 8664014: chromeos: move screen lock handling to power manager client (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebased Created 9 years, 1 month 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/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 9972e4bbc5c30d8b2334bd45eeea41041568d318..f6f6d5b817b0a84dcf1aca176c46639f5d98bb61 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/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,9 @@ SystemEventObserver* g_system_event_observer = NULL;
}
SystemEventObserver::SystemEventObserver() {
- CrosLibrary::Get()->GetScreenLockLibrary()->AddObserver(this);
}
SystemEventObserver::~SystemEventObserver() {
- CrosLibrary::Get()->GetScreenLockLibrary()->RemoveObserver(this);
}
void SystemEventObserver::SystemResumed() {
@@ -35,19 +32,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() {

Powered by Google App Engine
This is Rietveld 408576698