ash: Merge LoginStatus update code path

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/common/accessibility_types.h"
 #include "ash/common/system/chromeos/supervised/custodian_info_tray_observer.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "base/callback_forward.h"
-#include "base/callback_list.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/supervised_user/supervised_user_service_observer.h"
 #include "chrome/browser/ui/browser_list_observer.h"
-#include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/prefs/pref_change_registrar.h"
-#include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace ash {
 class SystemTrayNotifier;
 }
 
-namespace user_manager {
-class User;
-}
-
 namespace chromeos {
 
 class SystemTrayDelegateChromeOS
     : public ui::ime::InputMethodMenuManager::Observer,
       public ash::SystemTrayDelegate,
-      public SessionManagerClient::Observer,
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
       public policy::CloudPolicyStore::Observer,
       public chrome::BrowserListObserver,
       public extensions::AppWindowRegistry::Observer,
-      public user_manager::UserManager::Observer,
-      public user_manager::UserManager::UserSessionStateObserver,
       public SupervisedUserServiceObserver,
       public input_method::InputMethodManager::ImeMenuObserver {
  public:
   SystemTrayDelegateChromeOS();
   ~SystemTrayDelegateChromeOS() override;
 
   // Overridden from ash::SystemTrayDelegate:
   void Initialize() override;
   ash::LoginStatus GetUserLoginStatus() const override;
   std::string GetEnterpriseDomain() const override;
@@ skipping 18 matching lines @@
   bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
   void ActiveUserWasChanged() override;
   bool IsSearchKeyMappedToCapsLock() override;
   void AddCustodianInfoTrayObserver(
       ash::CustodianInfoTrayObserver* observer) override;
   void RemoveCustodianInfoTrayObserver(
       ash::CustodianInfoTrayObserver* observer) override;
   std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem(
       ash::SystemTray* tray) override;
 
-  // Overridden from user_manager::UserManager::UserSessionStateObserver:
-  void UserChangedChildStatus(user_manager::User* user) override;
-
  private:
   ash::SystemTrayNotifier* GetSystemTrayNotifier();
 
   void SetProfile(Profile* profile);
 
   bool UnsetProfile(Profile* profile);
 
   void UpdateShowLogoutButtonInTray();
 
   void UpdateLogoutDialogDuration();
 
   void UpdateSessionStartTime();
 
   void UpdateSessionLengthLimit();
 
   void StopObservingAppWindowRegistry();
 
   void StopObservingCustodianInfoChanges();
 
   // Notify observers if the current user has no more open browser or app
   // windows.
   void NotifyIfLastWindowClosed();
 
-  // Overridden from SessionManagerClient::Observer.
-  void ScreenIsLocked() override;
-  void ScreenIsUnlocked() override;
-
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   void OnLanguageRemapSearchKeyToChanged();
 
   void OnAccessibilityModeChanged(
       ash::AccessibilityNotificationVisibility notify);
 
@@ skipping 58 matching lines @@
       custodian_info_changed_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_