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

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

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.h
diff --git a/chrome/browser/chromeos/accessibility/system_event_observer.h b/chrome/browser/chromeos/accessibility/system_event_observer.h
index 4102b034d93b3237cab856e4e8b763d976460d3c..72020c494968b6bca238dc88ebf88e6c5a8c931e 100644
--- a/chrome/browser/chromeos/accessibility/system_event_observer.h
+++ b/chrome/browser/chromeos/accessibility/system_event_observer.h
@@ -6,7 +6,6 @@
#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 {
@@ -14,8 +13,7 @@ namespace accessibility {
// A singleton class to observe system events like wake up from sleep and
// screen unlock.
-class SystemEventObserver : public PowerManagerClient::Observer,
- public ScreenLockLibrary::Observer {
+class SystemEventObserver : public PowerManagerClient::Observer {
public:
virtual ~SystemEventObserver();
@@ -23,14 +21,13 @@ class SystemEventObserver : public PowerManagerClient::Observer,
virtual void SystemResumed() OVERRIDE;
// ScreenLockLibrary::Observer override.
- virtual void LockScreen(ScreenLockLibrary* screen_lock_library) OVERRIDE;
+ virtual void LockScreen() OVERRIDE;
// ScreenLockLibrary::Observer override.
- virtual void UnlockScreen(ScreenLockLibrary* screen_lock_library) OVERRIDE;
+ virtual void UnlockScreen() OVERRIDE;
// ScreenLockLibrary::Observer override.
- virtual void UnlockScreenFailed(ScreenLockLibrary* screen_lock_library)
- OVERRIDE;
+ virtual void UnlockScreenFailed() OVERRIDE;
// Creates the global SystemEventObserver instance.
static void Initialize();
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/accessibility/system_event_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698