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

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

Issue 23790005: UserManager shutdown now also stops the profile image downloader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Typo fixed. Created 7 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 | chrome/browser/chromeos/login/user_image_manager.h » ('j') | 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 08261d234e910cdc248185030d4978b4cc1b30cb..53f45031247ebf41edcda96900004ca48144199c 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -769,7 +769,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
AccessibilityManager::Shutdown();
// Let the UserManager and WallpaperManager unregister itself as an observer
- // of the CrosSettings singleton before it is destroyed.
+ // of the CrosSettings singleton before it is destroyed. This also ensures
+ // that the UserManager has no URLRequest pending (see
+ // http://crbug.com/276659).
UserManager::Get()->Shutdown();
WallpaperManager::Get()->Shutdown();
@@ -780,12 +782,13 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Clean up dependency on CrosSettings and stop pending data fetches.
KioskAppManager::Shutdown();
+ // We first call PostMainMessageLoopRun and then destroy UserManager, because
+ // Ash needs to be closed before UserManager is destroyed. Also, on some tests
+ // MergeSessionThrottle::ShouldShowMergeSessionPage gets triggered during
+ // PostMainMessageLoopRun, which also requires UserManager to live (see
+ // http://crbug.com/243364).
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();
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/user_image_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698