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

Unified Diff: ash/common/wm_shell.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/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 9b82c36a60b11eb400ec244ee4b307fc24044209..86ec4ea164a21ae820ce271e111ce6ee05f0ea6c 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -13,6 +13,7 @@
#include "ash/ash_export.h"
#include "ash/common/media_delegate.h"
#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/wm/lock_state_observer.h"
#include "base/observer_list.h"
namespace views {
@@ -225,6 +226,11 @@ class ASH_EXPORT WmShell {
virtual void AddPointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
virtual void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
+ // TODO: Move these back to LockStateController when that has been moved.
James Cook 2016/07/20 21:14:30 nit: TODO(someone) -- the linter barfs on todo for
msw 2016/07/20 21:21:14 Eh, I'm okay with lint warnings here, unless you o
James Cook 2016/07/20 21:23:24 Sure, leave it as-is, especially since you have gr
+ void OnLockStateEvent(LockStateObserver::EventType event);
+ void AddLockStateObserver(LockStateObserver* observer);
+ void RemoveLockStateObserver(LockStateObserver* observer);
+
#if defined(OS_CHROMEOS)
LogoutConfirmationController* logout_confirmation_controller() {
return logout_confirmation_controller_.get();
@@ -282,6 +288,8 @@ class ASH_EXPORT WmShell {
std::unique_ptr<WindowCycleController> window_cycle_controller_;
std::unique_ptr<WindowSelectorController> window_selector_controller_;
+ base::ObserverList<LockStateObserver> lock_state_observers_;
+
bool simulate_modal_window_open_for_testing_ = false;
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698