TrayUser::GetTrayIndex method removed as not necessary. Swich->Switch renamed.

ash/system/user/tray_user.cc

Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index b3bd4ea1539c604d4e6c7f08b6a1a7e540e44846..83ab7e7514490380e3a2488adf1b30495b5df968 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())

[Mr4D (OOO till 08-26), 2015/03/21 20:59:16]

Hmm. We have this other multi profile mode (where one user logs in but uses
different cookie jars vs. havig multiple profiles landed). With that this
behavior changes. If you have tested the multiple profile mode (and not the
multi cookie jars) this should be fine.

[merkulova, 2015/03/23 09:53:54]

I think you mean multi-login. It doesn't influence ChromeOS tray. I tested
multiprofile mode.

-    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());