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

Unified Diff: ash/wm/lock_state_controller.h

Issue 2166043003: mash: Migrate ShelfLockingManager to ash/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ShelfLockingManager test access to Shelf. Created 4 years, 5 months 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: ash/wm/lock_state_controller.h
diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h
index 421e38c0cd3ccc7ebdbb7e0cf72fbb92515c7811..e9ed12e15e338133056ec2f0ccc61f9f8f7e4424 100644
--- a/ash/wm/lock_state_controller.h
+++ b/ash/wm/lock_state_controller.h
@@ -9,11 +9,9 @@
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
-#include "ash/wm/lock_state_observer.h"
#include "ash/wm/session_state_animator.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "base/observer_list.h"
#include "base/time/time.h"
#include "base/timer/elapsed_timer.h"
#include "base/timer/timer.h"
@@ -146,10 +144,6 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
void SetDelegate(std::unique_ptr<LockStateControllerDelegate> delegate);
- void AddObserver(LockStateObserver* observer);
- void RemoveObserver(LockStateObserver* observer);
- bool HasObserver(const LockStateObserver* observer) const;
-
// Starts locking (with slow animation) that can be cancelled.
// After locking and |kLockToShutdownTimeoutMs| StartShutdownAnimation()
// will be called unless CancelShutdownAnimation() is called, if
@@ -282,8 +276,6 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,
std::unique_ptr<LockStateControllerDelegate> delegate_;
- base::ObserverList<LockStateObserver> observers_;
-
// The current login status, or original login status from before we locked.
LoginStatus login_status_;

Powered by Google App Engine
This is Rietveld 408576698