Remove pre-MD code related to tray/menu user profiles.

ash/common/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/common/system/tray/system_tray.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 26 matching lines @@
 #include "ash/common/system/ime/tray_ime_chromeos.h"
 #include "ash/common/system/tiles/tray_tiles.h"
 #include "ash/common/system/tray/system_tray_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/tray_update.h"
 #include "ash/common/system/user/tray_user.h"
-#include "ash/common/system/user/tray_user_separator.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 202 matching lines @@
 
   // Create user items for each possible user.
   int maximum_user_profiles = WmShell::Get()
                                   ->GetSessionStateDelegate()
                                   ->GetMaximumNumberOfLoggedInUsers();
   for (int i = 0; i < maximum_user_profiles; i++)
     AddTrayItem(base::MakeUnique<TrayUser>(this, i));
 
   // Crucially, this trailing padding has to be inside the user item(s).
   // Otherwise it could be a main axis margin on the tray's box layout.
-  if (use_md)
-    AddTrayItem(base::MakeUnique<PaddingTrayItem>());
-
-  if (!use_md && maximum_user_profiles > 1) {
-    // Add a special double line separator between users and the rest of the
-    // menu if more than one user is logged in.
-    AddTrayItem(base::MakeUnique<TrayUserSeparator>(this));
-  }
+  AddTrayItem(base::MakeUnique<PaddingTrayItem>());
 
   tray_accessibility_ = new TrayAccessibility(this);
   if (!use_md)
     tray_date_ = new TrayDate(this);
   tray_update_ = new TrayUpdate(this);
 
   AddTrayItem(base::MakeUnique<TraySessionLengthLimit>(this));
   AddTrayItem(base::MakeUnique<TrayEnterprise>(this));
   AddTrayItem(base::MakeUnique<TraySupervisedUser>(this));
   AddTrayItem(base::MakeUnique<TrayIME>(this));
@@ skipping 609 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash