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

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

Issue 15769004: Destroy the UserManager after ChromeBrowserMainPartsLinux::PostMainMessageLoopRun (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment updated Created 7 years, 7 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 8c78bce1323821acb9ed4989c971e83404be29f6..54d3b38bf3a8c7d285a1f5c7208a03add6151ea0 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -872,10 +872,13 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
chrome::CloseAsh();
- // Destroy the UserManager after ash has been destroyed.
- UserManager::Destroy();
-
ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
+
+ // Destroy the UserManager after ash has been destroyed and
+ // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun run. The latter might
+ // trigger MergeSessionThrottle::ShouldShowMergeSessionPage, which requires
+ // the UserManager to exist.
+ UserManager::Destroy();
}
void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
« 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