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

ash/system/tray/test_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 "ash/system/tray/test_system_tray_delegate.h"
 
 #include <string>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/volume_control_delegate.h"
-#include "base/utf_string_conversions.h"
 #include "base/message_loop.h"
-#include "base/string16.h"
 #include "base/time.h"
 
 namespace ash {
 namespace test {
 
 namespace {
 
 class TestVolumeControlDelegate : public VolumeControlDelegate {
  public:
   TestVolumeControlDelegate() {}
@@ skipping 42 matching lines @@
 }
 
 void TestSystemTrayDelegate::Shutdown() {
 }
 
 bool TestSystemTrayDelegate::GetTrayVisibilityOnStartup() {
   return true;
 }
 
 // Overridden from SystemTrayDelegate:
-const base::string16 TestSystemTrayDelegate::GetUserDisplayName() const {
-  return UTF8ToUTF16("Über tray Über tray Über tray Über tray");
-}
-
-const std::string TestSystemTrayDelegate::GetUserEmail() const {
-  return "über@tray";
-}
-
-const gfx::ImageSkia& TestSystemTrayDelegate::GetUserImage() const {
-  return null_image_;
-}
-
 user::LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
   // At new user image screen manager->IsUserLoggedIn() would return true
   // but there's no browser session available yet so use SessionStarted().
   SessionStateDelegate* delegate =
       Shell::GetInstance()->session_state_delegate();
 
   if (!delegate->IsActiveUserSessionStarted())
     return ash::user::LOGGED_IN_NONE;
   if (delegate->IsScreenLocked())
     return user::LOGGED_IN_LOCKED;
   // TODO(nkostylev): Support LOGGED_IN_OWNER, LOGGED_IN_GUEST, LOGGED_IN_KIOSK,
   //                  LOGGED_IN_PUBLIC.
   return user::LOGGED_IN_USER;
 }
 
 bool TestSystemTrayDelegate::IsOobeCompleted() const {
   return true;
 }
 
-void TestSystemTrayDelegate::GetLoggedInUsers(UserEmailList* users) {
-}
-
-void TestSystemTrayDelegate::SwitchActiveUser(const std::string& email) {
-}
-
 void TestSystemTrayDelegate::ChangeProfilePicture() {
 }
 
 const std::string TestSystemTrayDelegate::GetEnterpriseDomain() const {
   return std::string();
 }
 
 const base::string16 TestSystemTrayDelegate::GetEnterpriseMessage() const {
   return string16();
 }
@@ skipping 249 matching lines @@
 base::string16 TestSystemTrayDelegate::FormatTimeDuration(
     const base::TimeDelta& delta) const {
   return base::string16();
 }
 
 void TestSystemTrayDelegate::MaybeSpeak(const std::string& utterance) const {
 }
 
 }  // namespace test
 }  // namespace ash