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

chrome/browser/ui/ash/system_tray_delegate_win.cc

Index: chrome/browser/ui/ash/system_tray_delegate_win.cc
===================================================================
--- chrome/browser/ui/ash/system_tray_delegate_win.cc	(revision 240512)
+++ chrome/browser/ui/ash/system_tray_delegate_win.cc	(working copy)
@@ -154,6 +154,13 @@
   virtual void ShowUserLogin() OVERRIDE {
   }
 
+  virtual void ShowSpringChargerReplacementDialog() OVERRIDE {
+  }
+
+  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE {
+    return false;
+  }
+
   virtual void ShutDown() OVERRIDE {
   }