TrayUser::GetTrayIndex method removed as not necessary.

Swich->Switch renamed.

BUG=467907

Review URL: https://codereview.chromium.org/1023183002

Cr-Commit-Position: refs/heads/master@{#321763}

2 files changed, 4 insertions, 18 deletions

diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index b3bd4ea..83ab7e7 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -142,7 +142,7 @@ void TrayUser::UpdateAfterLoginStatusChange(user::LoginStatus status) {
   // Only the active user is represented in the tray.
   if (!layout_view_)
     return;
-  if (GetTrayIndex() > 0)
+  if (multiprofile_index_ > 0)
     return;
   bool need_label = false;
   bool need_avatar = false;
@@ -259,7 +259,7 @@ void TrayUser::OnUserAddedToSession() {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   // Only create views for user items which are logged in.
-  if (GetTrayIndex() >= session_state_delegate->NumberOfLoggedInUsers())
+  if (multiprofile_index_ >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
   // Enforce a layout change that newly added items become visible.
@@ -274,11 +274,11 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
   SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (!avatar_ ||
-      GetTrayIndex() >= session_state_delegate->NumberOfLoggedInUsers())
+      multiprofile_index_ >= session_state_delegate->NumberOfLoggedInUsers())
     return;
 
   const user_manager::UserInfo* user_info =
-      session_state_delegate->GetUserInfo(GetTrayIndex());
+      session_state_delegate->GetUserInfo(multiprofile_index_);
   CHECK(user_info);
   avatar_->SetImage(user_info->GetImage(),
                     gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
@@ -288,17 +288,6 @@ void TrayUser::UpdateAvatarImage(user::LoginStatus status) {
     avatar_->SetSize(gfx::Size(kTrayAvatarSize, kTrayAvatarSize));
 }
 
-MultiProfileIndex TrayUser::GetTrayIndex() {
-  Shell* shell = Shell::GetInstance();
-  // If multi profile is not enabled we can use the normal index.
-  if (!shell->delegate()->IsMultiProfilesEnabled())
-    return multiprofile_index_;
-  // In case of multi profile we need to mirror the indices since the system
-  // tray items are in the reverse order then the menu items.
-  return shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers() -
-             1 - multiprofile_index_;
-}
-
 void TrayUser::UpdateLayoutOfItem() {
   RootWindowController* controller = GetRootWindowController(
       system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow());
diff --git a/ash/system/user/tray_user.h b/ash/system/user/tray_user.h
index c68ffef..87167de 100644
--- a/ash/system/user/tray_user.h
+++ b/ash/system/user/tray_user.h
@@ -76,9 +76,6 @@ class ASH_EXPORT TrayUser : public SystemTrayItem,
 
   void UpdateAvatarImage(user::LoginStatus status);
 
-  // Get the user index which should be used for the tray icon of this item.
-  MultiProfileIndex GetTrayIndex();
-
   // Updates the layout of this item.
   void UpdateLayoutOfItem();