ash: Use SessionController instead of SessionStateDelegate

ash/mus/shell_delegate_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/shell_delegate_mus.h"
 
 #include <utility>
 
 #include "ash/common/gpu_support_stub.h"
 #include "ash/common/palette_delegate.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accessibility_delegate_mus.h"
 #include "ash/mus/context_menu_mus.h"
 #include "ash/mus/shelf_delegate_mus.h"
 #include "ash/mus/system_tray_delegate_mus.h"
 #include "ash/mus/wallpaper_delegate_mus.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/gfx/image/image.h"
 
 namespace ash {
 namespace {
 
 class SessionStateDelegateStub : public SessionStateDelegate {

[James Cook, 2017/03/17 17:14:36]

We probably don't need two SessionStateDelegateStub implementations (here and in
wm_shell_mus.cc). It would be good to remove one of them. Can you file a bug for
that? I'm happy to help with that if you're busy.

[xiyuan, 2017/03/17 22:52:02]

Filed http://crbug.com/702809 to track.

After we figure out where to put the multi-profile avatar code, we probably can
get rid of them together with 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 {
-    // ash_shell has 2 users.
-    return 2;
-  }
-  bool IsActiveUserSessionStarted() const override { return true; }
-  bool CanLockScreen() const override { return true; }
-  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();
   }
   gfx::ImageSkia GetAvatarImageForWindow(WmWindow* window) const override {
     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_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 ShellDelegateMus::ShellDelegateMus(service_manager::Connector* connector)
     : connector_(connector) {}
@@ skipping 107 matching lines @@
 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled,
                                                     bool use_local_state) {
   NOTIMPLEMENTED();
 }
 
 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace ash