Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
index 6696e6a32151881ce75664a34bee0ac0bea3a511..4a1aa31bc93330aa2ca9c1c41890c2a9decdfced 100644 |
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc |
@@ -21,7 +21,6 @@ |
#include "ash/common/system/ime/ime_observer.h" |
#include "ash/common/system/tray/system_tray_notifier.h" |
#include "ash/common/system/tray_accessibility.h" |
-#include "ash/common/system/user/user_observer.h" |
#include "ash/shell.h" |
#include "ash/system/chromeos/rotation/tray_rotation_lock.h" |
#include "base/callback.h" |
@@ -145,7 +144,6 @@ SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS() |
base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged, |
base::Unretained(this))); |
- user_manager::UserManager::Get()->AddObserver(this); |
user_manager::UserManager::Get()->AddSessionStateObserver(this); |
} |
@@ -208,7 +206,6 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() { |
if (policy_manager) |
policy_manager->core()->store()->RemoveObserver(this); |
- user_manager::UserManager::Get()->RemoveObserver(this); |
user_manager::UserManager::Get()->RemoveSessionStateObserver(this); |
} |
@@ -423,7 +420,6 @@ int SystemTrayDelegateChromeOS::GetSystemTrayMenuWidth() { |
void SystemTrayDelegateChromeOS::ActiveUserWasChanged() { |
SetProfile(ProfileManager::GetActiveUserProfile()); |
- GetSystemTrayNotifier()->NotifyUserUpdate(); |
} |
bool SystemTrayDelegateChromeOS::IsSearchKeyMappedToCapsLock() { |
@@ -445,15 +441,6 @@ SystemTrayDelegateChromeOS::CreateRotationLockTrayItem(ash::SystemTray* tray) { |
return base::MakeUnique<ash::TrayRotationLock>(tray); |
} |
-void SystemTrayDelegateChromeOS::UserAddedToSession( |
- const user_manager::User* active_user) { |
- GetSystemTrayNotifier()->NotifyUserAddedToSession(); |
-} |
- |
-void SystemTrayDelegateChromeOS::ActiveUserChanged( |
- const user_manager::User* /* active_user */) { |
-} |
- |
void SystemTrayDelegateChromeOS::UserChangedChildStatus( |
user_manager::User* user) { |
Profile* user_profile = ProfileHelper::Get()->GetProfileByUser(user); |
@@ -713,13 +700,6 @@ void SystemTrayDelegateChromeOS::OnStoreError(policy::CloudPolicyStore* store) { |
UpdateEnterpriseDomain(); |
} |
-void SystemTrayDelegateChromeOS::OnUserImageChanged( |
- const user_manager::User& user) { |
- // This is also invoked on login screen when user avatar is loaded from file. |
- if (GetUserLoginStatus() != ash::LoginStatus::NOT_LOGGED_IN) |
- GetSystemTrayNotifier()->NotifyUserUpdate(); |
-} |
- |
// Overridden from chrome::BrowserListObserver. |
void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) { |
NotifyIfLastWindowClosed(); |