Chromium Code Reviews| 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..0ef7bd8a88c1fb236940e3b4b03c784c24522543 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -92,10 +92,10 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() { |
| chromeos::BluetoothManager::Shutdown(); |
| - chromeos::DBusThreadManager::Shutdown(); |
| - |
| chromeos::accessibility::SystemEventObserver::Shutdown(); |
|
satorux1
2011/11/23 19:38:09
initialization and shutdown should be done in the
Simon Que
2011/11/23 19:42:29
Done.
satorux1
2011/11/23 20:18:01
Noooo, this doesn't look like the right order.
Th
|
| + chromeos::DBusThreadManager::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. |