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

ash/system/web_notification/web_notification_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/web_notification/web_notification_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_layout_manager_observer.h"
@@ skipping 375 matching lines @@
   if (message_center_bubble()) {
     static_cast<message_center::MessageCenterBubble*>(
         message_center_bubble()->bubble())->SetSettingsVisible();
     return true;
   }
   return ShowMessageCenterInternal(true /* show_settings */);
 }
 
 bool WebNotificationTray::IsContextMenuEnabled() const {
   user::LoginStatus login_status = status_area_widget()->login_status();
+  bool userAddingRunning = ash::Shell::GetInstance()
+                               ->session_state_delegate()
+                               ->IsInSecondaryLoginScreen();
+
   return login_status != user::LOGGED_IN_NONE
-      && login_status != user::LOGGED_IN_LOCKED;
+      && login_status != user::LOGGED_IN_LOCKED && !userAddingRunning;
 }
 
 message_center::MessageCenterTray* WebNotificationTray::GetMessageCenterTray() {
   return message_center_tray_.get();
 }
 
 bool WebNotificationTray::IsCommandIdChecked(int command_id) const {
   if (command_id != kToggleQuietMode)
     return false;
   return message_center()->IsQuietMode();
@@ skipping 42 matching lines @@
     return;
   should_update_tray_content_ = false;
 
   message_center::MessageCenter* message_center =
       message_center_tray_->message_center();
   button_->SetUnreadCount(message_center->UnreadNotificationCount());
   if (IsMessageCenterBubbleVisible())
     button_->SetState(views::CustomButton::STATE_PRESSED);
   else
     button_->SetState(views::CustomButton::STATE_NORMAL);
+  bool userAddingRunning = ash::Shell::GetInstance()
+                               ->session_state_delegate()
+                               ->IsInSecondaryLoginScreen();
+
   SetVisible((status_area_widget()->login_status() != user::LOGGED_IN_NONE) &&
              (status_area_widget()->login_status() != user::LOGGED_IN_LOCKED) &&
-             (message_center->NotificationCount() > 0));
+             !userAddingRunning && (message_center->NotificationCount() > 0));
   Layout();
   SchedulePaint();
 }
 
 bool WebNotificationTray::ClickedOutsideBubble() {
   // Only hide the message center
   if (!message_center_bubble())
     return false;
 
   message_center_tray_->HideMessageCenterBubble();
@@ skipping 12 matching lines @@
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
 }  // namespace ash