Revert 240927 "Disable the spring charger dialog on locked screen."

trunk/src/ash/system/chromeos/power/tray_power.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/power/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/date/date_view.h"
@@ skipping 150 matching lines @@
 void TrayPower::UpdateAfterLoginStatusChange(user::LoginStatus status) {
 }
 
 void TrayPower::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   SetTrayImageItemBorder(power_tray_, alignment);
 }
 
 void TrayPower::OnPowerStatusChanged() {
   RecordChargerType();
 
-  // TODO(jennyz): Enable showing spring charger dialog on locked screen after
-  // crbug.com/328593 is fixed.
-  user::LoginStatus login_status =
-      Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();
-  if (PowerStatus::Get()->IsOriginalSpringChargerConnected() &&
-      (login_status != user::LOGGED_IN_NONE &&
-       login_status != user::LOGGED_IN_LOCKED)) {
+  if (PowerStatus::Get()->IsOriginalSpringChargerConnected()) {
     ash::Shell::GetInstance()->system_tray_delegate()->
         ShowSpringChargerReplacementDialog();
   }
 
   bool battery_alert = UpdateNotificationState();
   if (power_tray_)
     power_tray_->UpdateStatus(battery_alert);
   if (notification_view_)
     notification_view_->UpdateStatus();
 
@@ skipping 150 matching lines @@
 
   if (current_charger != UNKNOWN_CHARGER) {
     UMA_HISTOGRAM_ENUMERATION("Power.ChargerType",
                               current_charger,
                               CHARGER_TYPE_COUNT);
   }
 }
 
 }  // namespace internal
 }  // namespace ash