| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index 105c9c5cb32ccdbbffe6024e3ffc9940de3020c1..e8f482c08f599722d0ce55e42a00c93711049fc3 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -46,7 +46,6 @@
|
| #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/events/system_key_event_listener.h"
|
| #include "chrome/browser/chromeos/input_method/input_method_util.h"
|
| #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
|
| @@ -82,7 +81,6 @@
|
| #include "chrome/browser/ui/scoped_tabbed_browser_displayer.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/upgrade_detector.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -593,25 +591,6 @@ void SystemTrayDelegateChromeOS::ShowUserLogin() {
|
| }
|
| }
|
|
|
| -bool SystemTrayDelegateChromeOS::ShowSpringChargerReplacementDialog() {
|
| - if (!ChargerReplacementDialog::ShouldShowDialog())
|
| - return false;
|
| -
|
| - ChargerReplacementDialog* dialog =
|
| - new ChargerReplacementDialog(GetNativeWindow());
|
| - dialog->Show();
|
| - return true;
|
| -}
|
| -
|
| -bool SystemTrayDelegateChromeOS::IsSpringChargerReplacementDialogVisible() {
|
| - return ChargerReplacementDialog::IsDialogVisible();
|
| -}
|
| -
|
| -bool SystemTrayDelegateChromeOS::HasUserConfirmedSafeSpringCharger() {
|
| - return ChargerReplacementHandler::GetChargerStatusPref() ==
|
| - ChargerReplacementHandler::CONFIRM_SAFE_CHARGER;
|
| -}
|
| -
|
| void SystemTrayDelegateChromeOS::ShutDown() {
|
| ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown();
|
| }
|
|
|