| 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 d710a69d04c5743a4e64710029a89067d6097b79..b3b54cb9eb1bf3e63756a6af0fab1dd6a8624dc4 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -228,7 +228,6 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos(
|
| ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
|
| chromeos::ShutdownKioskModeScreensaver();
|
| cryptohome::AsyncMethodCaller::Shutdown();
|
| - chromeos::imageburner::BurnManager::Shutdown();
|
| chromeos::disks::DiskMountManager::Shutdown();
|
|
|
| // CrosLibrary is shut down before DBusThreadManager even though the former
|
| @@ -290,7 +289,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
| session_manager_observer_.reset(new chromeos::SessionManagerObserver);
|
|
|
| chromeos::disks::DiskMountManager::Initialize();
|
| - chromeos::imageburner::BurnManager::Initialize();
|
| cryptohome::AsyncMethodCaller::Initialize();
|
|
|
| // Initialize the network change notifier for Chrome OS. The network
|
| @@ -326,6 +324,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
|
|
| void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
| chromeos::AudioHandler::Initialize();
|
| + chromeos::imageburner::BurnManager::Initialize();
|
|
|
| // Listen for system key events so that the user will be able to adjust the
|
| // volume on the login screen, if Chrome is running on Chrome OS
|
| @@ -533,6 +532,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
|
| // even if Initialize() wasn't called.
|
| chromeos::SystemKeyEventListener::Shutdown();
|
| + chromeos::imageburner::BurnManager::Shutdown();
|
| chromeos::AudioHandler::Shutdown();
|
|
|
| chromeos::WebSocketProxyController::Shutdown();
|
|
|