Tray elements behave appropriately on the multiple signin screen (more like lock screen)

ash/system/date/date_default_view.cc

 // Copyright 2014 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/date/date_default_view.h"
 
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
@@ skipping 24 matching lines @@
       date_view_(NULL) {
   SetLayoutManager(new views::FillLayout);
 
   date_view_ = new tray::DateView();
   date_view_->SetBorder(views::Border::CreateEmptyBorder(
       kPaddingVertical, ash::kTrayPopupPaddingHorizontal, 0, 0));
   SpecialPopupRow* view = new SpecialPopupRow();
   view->SetContent(date_view_);
   AddChildView(view);
 
-  if (login == ash::user::LOGGED_IN_LOCKED ||
-      login == ash::user::LOGGED_IN_NONE)
+  bool userAddingRunning = ash::Shell::GetInstance()
+                               ->session_state_delegate()
+                               ->IsInSecondaryLoginScreen();
+
+  if (login == user::LOGGED_IN_LOCKED ||
+      login == user::LOGGED_IN_NONE || userAddingRunning)
     return;
 
   date_view_->SetAction(TrayDate::SHOW_DATE_SETTINGS);
 
   help_ = new TrayPopupHeaderButton(this,
                                     IDR_AURA_UBER_TRAY_HELP,
                                     IDR_AURA_UBER_TRAY_HELP,
                                     IDR_AURA_UBER_TRAY_HELP_HOVER,
                                     IDR_AURA_UBER_TRAY_HELP_HOVER,
                                     IDS_ASH_STATUS_TRAY_HELP);
@@ skipping 54 matching lines @@
     tray_delegate->ShutDown();
   } else if (sender == lock_) {
     shell->metrics()->RecordUserMetricsAction(ash::UMA_TRAY_LOCK_SCREEN);
     tray_delegate->RequestLockScreen();
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace ash