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

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

Issue 1285363003: Fix UserSessionManager::Shutdown ordering. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ec7128d63895be27186629870596165a0935fb45..52558ad056c398c8362a1c9d3b25f34f0f02f6b7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -737,6 +737,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Clean up dependency on CrosSettings and stop pending data fetches.
KioskAppManager::Shutdown();
+ // Make sure that there is no pending URLRequests.
+ UserSessionManager::GetInstance()->Shutdown();
+
// Give BrowserPolicyConnectorChromeOS a chance to unregister any observers
// on services that are going to be deleted later but before its Shutdown()
// is called.
@@ -763,9 +766,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
g_browser_process->platform_part()->DestroyChromeUserManager();
- // Make sure that there is no pending URLRequests.
- UserSessionManager::GetInstance()->Shutdown();
-
g_browser_process->platform_part()->ShutdownSessionManager();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698