| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| index 1e3fcf00a237a9837f59ca2f628906f0386fe648..59c7ca4e1d2cb13ef1a82bcf605084d24953b38c 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -46,6 +46,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"
|
| @@ -80,6 +81,7 @@
|
| #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/ui/webui/chromeos/mobile_setup_dialog.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -617,6 +619,20 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
|
| 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();
|
| }
|
|
|