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

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 "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 124 matching lines @@
   user_ = nullptr;
 }
 
 void TrayUser::DestroyDetailedView() {
 }
 
 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;
   SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
   if (delegate->IsUserSupervised())
     need_label =  true;
   switch (status) {
     case user::LOGGED_IN_LOCKED:
     case user::LOGGED_IN_USER:
     case user::LOGGED_IN_OWNER:
@@ skipping 96 matching lines @@
 
 void TrayUser::OnUserUpdate() {
   UpdateAvatarImage(Shell::GetInstance()->system_tray_delegate()->
       GetUserLoginStatus());
 }
 
 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.
   UpdateLayoutOfItem();
 
   // Update the user item.
   UpdateAvatarImage(
       Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus());
 }
 
 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));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     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());
   if (controller && controller->shelf()) {
     UpdateAfterShelfAlignmentChange(
         controller->GetShelfLayoutManager()->GetAlignment());
   }
 }
 
 }  // namespace ash