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 002bf517ef4d5dd5f6aa93853cececbe1a9722ca..c39a1d70bef1b5803408e0c18082d1e674887e3c 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -88,14 +88,14 @@ ChromeBrowserMainPartsChromeos::ChromeBrowserMainPartsChromeos( |
} |
ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { |
+ chromeos::accessibility::SystemEventObserver::Shutdown(); |
+ |
chromeos::disks::DiskMountManager::Shutdown(); |
chromeos::BluetoothManager::Shutdown(); |
chromeos::DBusThreadManager::Shutdown(); |
- chromeos::accessibility::SystemEventObserver::Shutdown(); |
- |
if (!parameters().ui_task && chromeos::CrosLibrary::Get()) |
chromeos::CrosLibrary::Shutdown(); |
@@ -129,8 +129,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() { |
// implementation. |
net::NetworkChangeNotifier::SetFactory( |
new chromeos::CrosNetworkChangeNotifierFactory()); |
- |
- chromeos::accessibility::SystemEventObserver::Initialize(); |
} |
void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
@@ -174,6 +172,9 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() { |
// Initialize the disk mount manager. |
chromeos::disks::DiskMountManager::Initialize(); |
+ // Initialize the system event observer. |
+ chromeos::accessibility::SystemEventObserver::Initialize(); |
+ |
// Initialize the network change notifier for Chrome OS. The network |
// change notifier starts to monitor changes from the power manager and |
// the network manager. |