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

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

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/common/wm_shell.cc ('k') | ash/mus/shell_delegate_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.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 8c1479cd833e37aa71babb35db4bd3988a72b9bf..0e804cc615404abda05cfe9535b16110a5c91d6b 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -54,37 +54,11 @@ namespace {
// of SessionStateDelegate.
class SessionStateDelegateStub : public SessionStateDelegate {
public:
- SessionStateDelegateStub()
- : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {}
+ SessionStateDelegateStub() : user_info_(new user_manager::UserInfoImpl()) {}
~SessionStateDelegateStub() override {}
// SessionStateDelegate:
- int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
- int NumberOfLoggedInUsers() const override { return 1; }
- bool IsActiveUserSessionStarted() const override { return true; }
- bool CanLockScreen() const override {
- // The Chrome OS session_manager process currently rejects screen-lock
- // requests due to no user being logged in.
- return false;
- }
- bool IsScreenLocked() const override { return screen_locked_; }
- bool ShouldLockScreenAutomatically() const override { return false; }
- void LockScreen() override {
- screen_locked_ = true;
- NOTIMPLEMENTED();
- }
- void UnlockScreen() override {
- NOTIMPLEMENTED();
- screen_locked_ = false;
- }
- bool IsUserSessionBlocked() const override { return false; }
- session_manager::SessionState GetSessionState() const override {
- return session_manager::SessionState::ACTIVE;
- }
- const user_manager::UserInfo* GetUserInfo(UserIndex index) const override {
- return user_info_.get();
- }
bool ShouldShowAvatar(WmWindow* window) const override {
NOTIMPLEMENTED();
return !user_info_->GetImage().isNull();
@@ -93,18 +67,8 @@ class SessionStateDelegateStub : public SessionStateDelegate {
NOTIMPLEMENTED();
return gfx::ImageSkia();
}
- void SwitchActiveUser(const AccountId& account_id) override {}
- void CycleActiveUser(CycleUserDirection direction) override {}
- bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
- return true;
- }
- void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
- void RemoveSessionStateObserver(
- ash::SessionStateObserver* observer) override {}
private:
- bool screen_locked_;
-
// A pseudo user info.
std::unique_ptr<user_manager::UserInfo> user_info_;
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698