Adding new user menu section to the SystemTrayMenu & refactoring of user access

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 374 matching lines @@
     if (policy_manager)
       policy_manager->core()->store()->RemoveObserver(this);
   }
 
   // Overridden from ash::SystemTrayDelegate:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
     // In case of OOBE / sign in screen tray will be shown later.
     return LoginState::Get()->IsUserLoggedIn();
   }
 
-  virtual const string16 GetUserDisplayName() const OVERRIDE {
-    return UserManager::Get()->GetActiveUser()->GetDisplayName();
-  }
-
-  virtual const std::string GetUserEmail() const OVERRIDE {
-    return UserManager::Get()->GetActiveUser()->display_email();
-  }
-
-  virtual const gfx::ImageSkia& GetUserImage() const OVERRIDE {
-    return UserManager::Get()->GetActiveUser()->image();
-  }
-
   virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
     // Map ChromeOS specific LOGGED_IN states to Ash LOGGED_IN states.
     LoginState::LoggedInState state = LoginState::Get()->GetLoggedInState();
     if (state == LoginState::LOGGED_IN_OOBE ||
         state == LoginState::LOGGED_IN_NONE) {
       return ash::user::LOGGED_IN_NONE;
     }
     if (screen_locked_)
       return ash::user::LOGGED_IN_LOCKED;
 
@@ skipping 18 matching lines @@
         return ash::user::LOGGED_IN_KIOSK_APP;
     }
     NOTREACHED();
     return ash::user::LOGGED_IN_NONE;
   }
 
   virtual bool IsOobeCompleted() const OVERRIDE {
     return StartupUtils::IsOobeCompleted();
   }
 
-  virtual void GetLoggedInUsers(ash::UserEmailList* users) OVERRIDE {
-    const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers();
-    for (UserList::const_iterator it = logged_in_users.begin();
-         it != logged_in_users.end(); ++it) {
-      const User* user = (*it);
-      users->push_back(user->email());
-    }
-  }
-
-  virtual void SwitchActiveUser(const std::string& email) OVERRIDE {
-    UserManager::Get()->SwitchActiveUser(email);
-  }
-
   virtual void ChangeProfilePicture() OVERRIDE {
     content::RecordAction(
         content::UserMetricsAction("OpenChangeProfilePictureDialog"));
     chrome::ShowSettingsSubPage(GetAppropriateBrowser(),
                                 chrome::kChangeProfilePictureSubPage);
   }
 
   virtual const std::string GetEnterpriseDomain() const OVERRIDE {
     return enterprise_domain_;
   }
 
   virtual const string16 GetEnterpriseMessage() const OVERRIDE {
     if (GetEnterpriseDomain().empty())
         return string16();
     return l10n_util::GetStringFUTF16(IDS_DEVICE_OWNED_BY_NOTICE,
                                       UTF8ToUTF16(GetEnterpriseDomain()));
   }
 
   virtual const std::string GetLocallyManagedUserManager() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
       return std::string();
-    return UserManager::Get()->GetManagerForManagedUser(GetUserEmail());
+    return UserManager::Get()->GetManagerForManagedUser(
+        chromeos::UserManager::Get()->GetActiveUser()->display_email());
   }
 
   virtual const string16 GetLocallyManagedUserMessage() const OVERRIDE {
     if (GetUserLoginStatus() != ash::user::LOGGED_IN_LOCALLY_MANAGED)
         return string16();
     return l10n_util::GetStringFUTF16(IDS_USER_IS_LOCALLY_MANAGED_BY_NOTICE,
                                       UTF8ToUTF16(
                                           GetLocallyManagedUserManager()));
   }
 
@@ skipping 1114 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos