Add SessionStateObserver with ActiveUserChanged()

ash/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/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 255 matching lines @@
   void AddLoggedInPublicModeUserCardContent(SystemTrayItem* owner);
 
   // Create the menu option to add another user. If |disabled| is set the user
   // cannot actively click on the item.
   void ToggleAddUserMenuOption();
 
   MultiProfileIndex multiprofile_index_;
   // The view of the user card.
   views::View* user_card_view_;
 
+  // This is the owner system tray item of this view.
+  SystemTrayItem* owner_;
+
   // True if |user_card_view_| is a |UserView| - otherwise it is only a
   // |views::View|.
   bool is_user_card_;
   views::View* logout_button_;
   scoped_ptr<ash::PopupMessage> popup_message_;
   scoped_ptr<views::Widget> add_menu_option_;
 
   // True when the add user panel is visible but not activatable.
   bool add_user_visible_but_disabled_;
 
@@ skipping 302 matching lines @@
   set_border(views::Border::CreateSolidSidedBorder(width, width, width, 1,
                                                    kBorderColor));
   SchedulePaint();
 }
 
 UserView::UserView(SystemTrayItem* owner,
                    ash::user::LoginStatus login,
                    MultiProfileIndex index)
     : multiprofile_index_(index),
       user_card_view_(NULL),
+      owner_(owner),
       is_user_card_(false),
       logout_button_(NULL),
       add_user_visible_but_disabled_(false) {
   CHECK_NE(ash::user::LOGGED_IN_NONE, login);
   if (!index) {
     // Only the logged in user will have a background. All other users will have
     // to allow the TrayPopupContainer highlighting the menu line.
     set_background(views::Background::CreateSolidBackground(
         login == ash::user::LOGGED_IN_PUBLIC ? kPublicAccountBackgroundColor :
                                                kBackgroundColor));
@@ skipping 95 matching lines @@
   if (sender == logout_button_) {
     ash::Shell::GetInstance()->system_tray_delegate()->SignOut();
   } else if (sender == user_card_view_ &&
              ash::Shell::GetInstance()->delegate()->IsMultiProfilesEnabled()) {
     if (!multiprofile_index_) {
       ToggleAddUserMenuOption();
     } else {
       ash::SessionStateDelegate* delegate =
           ash::Shell::GetInstance()->session_state_delegate();
       delegate->SwitchActiveUser(delegate->GetUserEmail(multiprofile_index_));
+      // Since the user list is about to change the system menu should get
+      // closed.
+      owner_->system_tray()->CloseSystemBubble();
     }
   } else if (add_menu_option_.get() &&
              sender == add_menu_option_->GetContentsView()) {
     // Let the user add another account to the session.
     ash::Shell::GetInstance()->system_tray_delegate()->ShowUserLogin();
   } else {
     NOTREACHED();
   }
 }
 
@@ skipping 490 matching lines @@
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
             multiprofile_index_),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash