Merge 240486 "Implement the spring charger replacement UI and ad..."

chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
===================================================================
--- chrome/browser/chromeos/system/ash_system_tray_delegate.cc	(revision 240507)
+++ chrome/browser/chromeos/system/ash_system_tray_delegate.cc	(working copy)
@@ -48,6 +48,7 @@
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
+#include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
@@ -83,6 +84,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/pref_names.h"
@@ -695,6 +697,20 @@
       UserAddingScreen::Get()->Start();
   }
 
+  virtual void ShowSpringChargerReplacementDialog() OVERRIDE {
+    if (!ChargerReplacementDialog::ShouldShowDialog())
+      return;
+
+    ChargerReplacementDialog* dialog =
+        new ChargerReplacementDialog(GetNativeWindow());
+    dialog->Show();
+  }
+
+  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE {
+    return ChargerReplacementHandler::GetChargerStatusPref() ==
+        ChargerReplacementHandler::CONFIRM_SAFE_CHARGER;
+  }
+
   virtual void ShutDown() OVERRIDE {
     ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
   }