Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index c0537959cfb10e3fb930f4e77e7abfff8d62048c..8b9664c96a5188133531c695dc3ff250be5dc25f 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -80,6 +80,7 @@
#include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
#include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h"
#include "chrome/browser/chromeos/settings/device_settings_service.h"
+#include "chrome/browser/chromeos/settings/shutdown_policy_forwarder.h"
#include "chrome/browser/chromeos/status/data_promo_notification.h"
#include "chrome/browser/chromeos/system/input_device_settings.h"
#include "chrome/browser/chromeos/ui/low_disk_notification.h"
@@ -768,6 +769,10 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
keyboard_event_rewriters_->Init();
}
+ // In classic ash must occur after ash::WmShell is initialized. Triggers a
+ // fetch of the initial CrosSettings DeviceRebootOnShutdown policy.
+ shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>();
+
ChromeBrowserMainPartsLinux::PostBrowserStart();
}
@@ -780,6 +785,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
arc_service_launcher_->Shutdown();
arc_kiosk_app_manager_.reset();
+ // Unregister CrosSettings observers before CrosSettings is destroyed.
+ shutdown_policy_forwarder_.reset();
+
// Destroy the application name notifier for Kiosk mode.
KioskModeIdleAppNameNotification::Shutdown();
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/chrome_interface_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698