diff options
Diffstat (limited to 'chrome/browser/chromeos/chrome_browser_main_chromeos.cc')
| -rw-r--r-- | chrome/browser/chromeos/chrome_browser_main_chromeos.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index 6a8e96a..4874b83 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -227,11 +227,16 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { chromeos::disks::DiskMountManager::Shutdown(); - chromeos::DBusThreadManager::Shutdown(); - + // CrosLibrary is shut down before DBusThreadManager even though the former + // is initialized before the latter becuase some of its libraries depend + // on DBus clients. + // TODO(hashimoto): Resolve this situation by removing CrosLibrary. + // (crosbug.com/26160) if (!parameters().ui_task && chromeos::CrosLibrary::Get()) chromeos::CrosLibrary::Shutdown(); + chromeos::DBusThreadManager::Shutdown(); + // To be precise, logout (browser shutdown) is not yet done, but the // remaining work is negligible, hence we say LogoutDone here. chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |