Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2351)

Unified Diff: ash/common/system/tray/system_tray.cc

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: back out a11y changes and rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/frame/custom_frame_view_ash_unittest.cc ('k') | ash/common/system/tray/tray_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
index fae5c963e3f98c78e69bf913cda44aaf9c45f85c..513635d4b547fb55deab63b87cdcef47bb8cd229 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -44,7 +44,6 @@
#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"
@@ -267,14 +266,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
// 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)
« no previous file with comments | « ash/common/frame/custom_frame_view_ash_unittest.cc ('k') | ash/common/system/tray/tray_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698