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

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

Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 8b9664c96a5188133531c695dc3ff250be5dc25f..8cd1f92445850ac608989704132ece5830566ceb 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -783,7 +783,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
arc_service_launcher_->Shutdown();
- arc_kiosk_app_manager_.reset();
// Unregister CrosSettings observers before CrosSettings is destroyed.
shutdown_policy_forwarder_.reset();
@@ -879,6 +878,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Ash needs to be closed before UserManager is destroyed.
ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
+ // Destroy ArcKioskAppManager after its observers are removed when Ash is
+ // closed above.
+ arc_kiosk_app_manager_.reset();
+
if (!chrome::IsRunningInMash())
AccessibilityManager::Shutdown();
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service.cc ('k') | chrome/browser/chromeos/login/existing_user_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698