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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ash/mus/BUILD.gn ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698