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

ash/system/tray/default_system_tray_delegate.cc

 // Copyright 2013 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/tray/default_system_tray_delegate.h"
 
 #include <string>
 
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
@@ skipping 134 matching lines @@
 
 void DefaultSystemTrayDelegate::ShowEnterpriseInfo() {
 }
 
 void DefaultSystemTrayDelegate::ShowLocallyManagedUserInfo() {
 }
 
 void DefaultSystemTrayDelegate::ShowUserLogin() {
 }
 
+void DefaultSystemTrayDelegate::ShowSpringChargerReplacementDialog() {
+}
+
+bool DefaultSystemTrayDelegate::HasUserConfirmedSafeSpringCharger() {
+  return false;
+}
+
 void DefaultSystemTrayDelegate::ShutDown() {
 }
 
 void DefaultSystemTrayDelegate::SignOut() {
 }
 
 void DefaultSystemTrayDelegate::RequestLockScreen() {
 }
 
 void DefaultSystemTrayDelegate::RequestRestartForUpdate() {
@@ skipping 105 matching lines @@
 
 int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
   // This is the default width for English languages.
   return 300;
 }
 
 void DefaultSystemTrayDelegate::MaybeSpeak(const std::string& utterance) const {
 }
 
 }  // namespace ash