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

Unified Diff: ash/aura/wm_shell_aura.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/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.h
diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h
index 069355fb67d4965d804b6d73e8db67e763b818bb..34a15a1d928e8cc73c469a257ae68b54c5186770 100644
--- a/ash/aura/wm_shell_aura.h
+++ b/ash/aura/wm_shell_aura.h
@@ -38,8 +38,6 @@ class ASH_EXPORT WmShellAura : public WmShell,
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;
@@ -50,6 +48,7 @@ class ASH_EXPORT WmShellAura : public WmShell,
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;
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698