CrOS md user row adjustments

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 "ash/common/key_event_watcher.h"
 #include "ash/common/login_status.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 232 matching lines @@
   TrayBackgroundView::Initialize();
   CreateItems(delegate);
 }
 
 void SystemTray::Shutdown() {
   DCHECK(web_notification_tray_);
   web_notification_tray_ = nullptr;
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
+  const bool use_md = MaterialDesignController::IsSystemTrayMenuMaterial();
 #if !defined(OS_WIN)
   // 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(new 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 (MaterialDesignController::IsSystemTrayMenuMaterial())
+  if (use_md)
     AddTrayItem(new PaddingTrayItem());
 
-  if (maximum_user_profiles > 1) {
+  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(new TrayUserSeparator(this));
   }
 #endif
 
-  const bool use_material_design =
-      MaterialDesignController::IsSystemTrayMenuMaterial();
   tray_accessibility_ = new TrayAccessibility(this);
-  if (!use_material_design)
+  if (!use_md)
     tray_date_ = new TrayDate(this);
   tray_update_ = new TrayUpdate(this);
 
 #if defined(OS_CHROMEOS)
   AddTrayItem(new TraySessionLengthLimit(this));
   AddTrayItem(new TrayEnterprise(this));
   AddTrayItem(new TraySupervisedUser(this));
   AddTrayItem(new TrayIME(this));
   AddTrayItem(tray_accessibility_);
   AddTrayItem(new TrayTracing(this));
@@ skipping 12 matching lines @@
   tray_audio_ = new TrayAudio(this);
   AddTrayItem(tray_audio_);
   AddTrayItem(new TrayBrightness(this));
   AddTrayItem(new TrayCapsLock(this));
   // TODO(jamescook): Remove this when mus has support for display management
   // and we have a DisplayManager equivalent. See http://crbug.com/548429
   std::unique_ptr<SystemTrayItem> tray_rotation_lock =
       delegate->CreateRotationLockTrayItem(this);
   if (tray_rotation_lock)
     AddTrayItem(tray_rotation_lock.release());
-  if (!use_material_design)
+  if (!use_md)
     AddTrayItem(new TraySettings(this));
   AddTrayItem(tray_update_);
-  if (use_material_design) {
+  if (use_md) {
     tray_tiles_ = new TrayTiles(this);
     AddTrayItem(tray_tiles_);
     tray_system_info_ = new TraySystemInfo(this);
     AddTrayItem(tray_system_info_);
   } else {
     AddTrayItem(tray_date_);
   }
 #elif defined(OS_WIN)
   AddTrayItem(tray_accessibility_);
   AddTrayItem(tray_update_);
-  if (!use_material_design)
+  if (!use_md)
     AddTrayItem(tray_date_);
 #endif
   // Leading padding.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
+  if (use_md)
     AddTrayItem(new PaddingTrayItem());
 }
 
 void SystemTray::AddTrayItem(SystemTrayItem* item) {
   items_.push_back(item);
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   views::View* tray_item = item->CreateTrayView(delegate->GetUserLoginStatus());
   item->UpdateAfterShelfAlignmentChange(shelf_alignment());
 
@@ skipping 616 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