Index: ash/mus/bridge/wm_shell_mus.h |
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h |
index 641c9d084bf3c10386e6cb8781daa1f807f4e8d4..4615290a0887c0c2b70e3dffa53e2eb244c0a6c8 100644 |
--- a/ash/mus/bridge/wm_shell_mus.h |
+++ b/ash/mus/bridge/wm_shell_mus.h |
@@ -51,8 +51,6 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver { |
std::vector<WmWindow*> GetMruWindowList() override; |
std::vector<WmWindow*> GetMruWindowListIgnoreModals() override; |
bool IsForceMaximizeOnFirstRun() override; |
- bool IsUserSessionBlocked() override; |
- bool IsScreenLocked() override; |
bool CanShowWindowForUser(WmWindow* window) override; |
void LockCursor() override; |
void UnlockCursor() override; |
@@ -63,6 +61,7 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver { |
wm::WindowState* window_state) override; |
bool IsOverviewModeSelecting() override; |
bool IsOverviewModeRestoringMinimizedWindows() override; |
+ SessionStateDelegate* GetSessionStateDelegate() override; |
void AddActivationObserver(WmActivationObserver* observer) override; |
void RemoveActivationObserver(WmActivationObserver* observer) override; |
void AddDisplayObserver(WmDisplayObserver* observer) override; |
@@ -85,6 +84,8 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver { |
std::vector<WmRootWindowControllerMus*> root_window_controllers_; |
+ std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
+ |
base::ObserverList<WmActivationObserver> activation_observers_; |
DISALLOW_COPY_AND_ASSIGN(WmShellMus); |