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

ash/system/tray/system_tray.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/system_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
@@ skipping 45 matching lines @@
 #include "ash/system/chromeos/power/tray_power.h"
 #include "ash/system/chromeos/screen_capture/tray_screen_capture.h"
 #include "ash/system/chromeos/settings/tray_settings.h"
 #include "ash/system/chromeos/tray_display.h"
 #endif
 
 using views::TrayBubbleView;
 
 namespace ash {
 
+// The maximum number of simultaneous user profiles.
+const int kMaxSimultaneousUserProfiles = 3;
+
 // The minimum width of the system tray menu width.
 const int kMinimumSystemTrayMenuWidth = 300;
 
 namespace internal {
 
 // Class to initialize and manage the SystemTrayBubble and TrayBubbleWrapper
 // instances for a bubble.
 
 class SystemBubbleWrapper {
  public:
@@ skipping 55 matching lines @@
 
 void SystemTray::InitializeTrayItems(SystemTrayDelegate* delegate) {
   internal::TrayBackgroundView::Initialize();
   CreateItems(delegate);
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
 #if !defined(OS_WIN)
   AddTrayItem(new internal::TraySessionLengthLimit(this));
   AddTrayItem(new internal::TrayLogoutButton(this));
-  AddTrayItem(new internal::TrayUser(this));
+  // In multi-profile user mode we can have multiple user tiles.
+  // The additional entry is used for a double separator.
+  int maximum_user_profiles =
+      ash::Shell::GetInstance()->delegate()->IsMultiProfilesEnabled() ?
+          (kMaxSimultaneousUserProfiles + 1): 1;
+  for (int i = 0; i < maximum_user_profiles; i++)
+    AddTrayItem(new internal::TrayUser(this, i));
+
 #endif
 #if defined(OS_CHROMEOS)
   AddTrayItem(new internal::TrayEnterprise(this));
   AddTrayItem(new internal::TrayLocallyManagedUser(this));
 #endif
   AddTrayItem(new internal::TrayIME(this));
   tray_accessibility_ = new internal::TrayAccessibility(this);
   AddTrayItem(tray_accessibility_);
 #if defined(OS_CHROMEOS)
   AddTrayItem(new internal::TrayPower(this));
@@ skipping 414 matching lines @@
         ConvertPointToWidget(this, &point);
         arrow_offset = point.x();
       }
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
 }  // namespace ash