ash: Fix system tray avatar not updated regression

ash/common/system/user/tray_user.cc

 // Copyright (c) 2012 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/common/system/user/tray_user.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/system/user/user_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/logging.h"
 #include "base/strings/string16.h"
@@ skipping 10 matching lines @@
 namespace {
 
 const int kUserLabelToIconPadding = 5;
 
 }  // namespace
 
 namespace ash {
 
 TrayUser::TrayUser(SystemTray* system_tray, UserIndex index)
     : SystemTrayItem(system_tray, UMA_USER),
-      user_index_(index),
-      user_(nullptr),
-      layout_view_(nullptr),
-      avatar_(nullptr),
-      label_(nullptr) {
-  Shell::Get()->system_tray_notifier()->AddUserObserver(this);
-}
+      scoped_session_observer_(this),
+      user_index_(index) {}
 
-TrayUser::~TrayUser() {
-  Shell::Get()->system_tray_notifier()->RemoveUserObserver(this);
-}
+TrayUser::~TrayUser() {}
 
 TrayUser::TestState TrayUser::GetStateForTest() const {
   if (!user_)
     return HIDDEN;
   return user_->GetStateForTest();
 }
 
 gfx::Size TrayUser::GetLayoutSizeForTest() const {
   return layout_view_ ? layout_view_->size() : gfx::Size();
 }
@@ skipping 148 matching lines @@
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment,
           kTrayLabelItemVerticalPaddingVerticalAlignment,
           kTrayLabelItemHorizontalPaddingBottomAlignment));
     }
     layout_view_->SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, kUserLabelToIconPadding));
   }
 }
 
-void TrayUser::OnUserUpdate() {
-  UpdateAvatarImage(Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+void TrayUser::ActiveUserChanged(const AccountId& account_id) {
+  UserSessionUpdated(account_id);
 }
 
-void TrayUser::OnUserAddedToSession() {
+void TrayUser::UserAddedToSession(const AccountId& account_id) {
   const SessionController* const session_controller =
       Shell::Get()->session_controller();
   // Only create views for user items which are logged in.
   if (user_index_ >= session_controller->NumberOfLoggedInUsers())
     return;
 
   // Enforce a layout change that newly added items become visible.
   UpdateLayoutOfItem();
 
   // Update the user item.
-  UpdateAvatarImage(Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+  UpdateAvatarImage(Shell::Get()->session_controller()->GetLoginStatus());
+}
+
+void TrayUser::UserSessionUpdated(const AccountId& account_id) {
+  UpdateAvatarImage(Shell::Get()->session_controller()->GetLoginStatus());
 }
 
 void TrayUser::UpdateAvatarImage(LoginStatus status) {
   const SessionController* const session_controller =
       Shell::Get()->session_controller();
   if (!avatar_ || user_index_ >= session_controller->NumberOfLoggedInUsers())
     return;
 
   const mojom::UserSession* const user_session =
       session_controller->GetUserSession(user_index_);
   CHECK(user_session);
   avatar_->SetImage(user_session->avatar,
                     gfx::Size(kTrayItemSize, kTrayItemSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash