| Index: chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
|
| index 0c0266eade1e5bc13c8dd662c5f6e74bb01da530..ea96dd648c7617533ffbaa5b71cc9c453eac2aac 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service.cc
|
| @@ -34,15 +34,6 @@
|
| system::AutomaticRebootManager* automatic_reboot_manager)
|
| : profile_(profile),
|
| automatic_reboot_manager_(automatic_reboot_manager) {
|
| -}
|
| -
|
| -KioskAppUpdateService::~KioskAppUpdateService() {
|
| -}
|
| -
|
| -void KioskAppUpdateService::Init(const std::string& app_id) {
|
| - DCHECK(app_id_.empty());
|
| - app_id_ = app_id;
|
| -
|
| ExtensionService* service =
|
| extensions::ExtensionSystem::Get(profile_)->extension_service();
|
| if (service)
|
| @@ -53,9 +44,9 @@
|
|
|
| if (KioskAppManager::Get())
|
| KioskAppManager::Get()->AddObserver(this);
|
| +}
|
|
|
| - if (automatic_reboot_manager_->reboot_requested())
|
| - OnRebootRequested(automatic_reboot_manager_->reboot_reason());
|
| +KioskAppUpdateService::~KioskAppUpdateService() {
|
| }
|
|
|
| void KioskAppUpdateService::StartAppUpdateRestartTimer() {
|
| @@ -81,8 +72,6 @@
|
| service->RemoveUpdateObserver(this);
|
| if (KioskAppManager::Get())
|
| KioskAppManager::Get()->RemoveObserver(this);
|
| - if (automatic_reboot_manager_)
|
| - automatic_reboot_manager_->RemoveObserver(this);
|
| }
|
|
|
| void KioskAppUpdateService::OnAppUpdateAvailable(
|
| @@ -104,7 +93,7 @@
|
| StartAppUpdateRestartTimer();
|
| }
|
|
|
| -void KioskAppUpdateService::OnRebootRequested(Reason reason) {
|
| +void KioskAppUpdateService::OnRebootScheduled(Reason reason) {
|
| extensions::core_api::runtime::OnRestartRequired::Reason restart_reason =
|
| extensions::core_api::runtime::OnRestartRequired::REASON_NONE;
|
| switch (reason) {
|
|
|