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

ash/system/chromeos/settings/tray_settings.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/chromeos/settings/tray_settings.h"
 
+#include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/tray/actionable_view.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
@@ skipping 16 matching lines @@
   explicit SettingsDefaultView(user::LoginStatus status)
       : login_status_(status),
         label_(NULL),
         power_status_view_(NULL) {
     PowerStatus::Get()->AddObserver(this);
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
         ash::kTrayPopupPaddingHorizontal, 0,
         ash::kTrayPopupPaddingBetweenItems));
 
     bool power_view_right_align = false;
+    bool userAddingRunning =
+        (ash::Shell::GetInstance()
+             ->session_state_delegate()
+             ->GetSessionState() ==
+         ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+
     if (login_status_ != user::LOGGED_IN_NONE &&
-        login_status_ != user::LOGGED_IN_LOCKED) {
+        login_status_ != user::LOGGED_IN_LOCKED && !userAddingRunning) {
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       views::ImageView* icon =
           new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
       icon->SetImage(
           rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
       icon->set_id(test::kSettingsTrayItemViewId);
       AddChildView(icon);
 
       base::string16 text = rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_SETTINGS);
       label_ = new views::Label(text);
@@ skipping 10 matching lines @@
       OnPowerStatusChanged();
     }
   }
 
   virtual ~SettingsDefaultView() {
     PowerStatus::Get()->RemoveObserver(this);
   }
 
   // Overridden from ash::ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE {
+    bool userAddingRunning =
+        (ash::Shell::GetInstance()
+             ->session_state_delegate()
+             ->GetSessionState() ==
+         ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+
     if (login_status_ == user::LOGGED_IN_NONE ||
-        login_status_ == user::LOGGED_IN_LOCKED)
+        login_status_ == user::LOGGED_IN_LOCKED || userAddingRunning)
       return false;
 
     ash::Shell::GetInstance()->system_tray_delegate()->ShowSettings();
     return true;
   }
 
   // Overridden from views::View.
   virtual void Layout() OVERRIDE {
     views::View::Layout();
 
@@ skipping 42 matching lines @@
 }
 
 TraySettings::~TraySettings() {
 }
 
 views::View* TraySettings::CreateTrayView(user::LoginStatus status) {
   return NULL;
 }
 
 views::View* TraySettings::CreateDefaultView(user::LoginStatus status) {
-  if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED) &&
+  bool userAddingRunning =
+      (ash::Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
+       ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY);
+

[oshima, 2014/08/01 20:31:22]

same here. this can be handled by ShouldShowSettings()

[Roman Sorokin (ftl), 2014/08/05 13:44:09]

Done.

+  if ((status == user::LOGGED_IN_NONE || status == user::LOGGED_IN_LOCKED ||
+       userAddingRunning) &&
       !PowerStatus::Get()->IsBatteryPresent())
     return NULL;
   if (!ash::Shell::GetInstance()->system_tray_delegate()->ShouldShowSettings())
     return NULL;
   CHECK(default_view_ == NULL);
   default_view_ =  new tray::SettingsDefaultView(status);
   return default_view_;
 }
 
 views::View* TraySettings::CreateDetailedView(user::LoginStatus status) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void TraySettings::DestroyTrayView() {
 }
 
 void TraySettings::DestroyDefaultView() {
   default_view_ = NULL;
 }
 
 void TraySettings::DestroyDetailedView() {
 }
 
 void TraySettings::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 }  // namespace ash