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 4c143fe2380ce7b70a3cfcb6da64d7a3d8c6f40f..951ec4ecbcc58818e25bd7a7b9a902131f42f943 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -279,9 +279,6 @@ class DBusServices { |
| DeviceSettingsService::Get()->Initialize( |
| DBusThreadManager::Get()->GetSessionManagerClient(), |
| OwnerKeyUtil::Create()); |
| - |
|
bshe
2013/01/21 22:53:07
In order to add CrosSettingsObserver in ctor of Wa
|
| - // Add observers for WallpaperManager. This depends on PowerManagerClient(). |
| - WallpaperManager::Get()->AddObservers(); |
| } |
| // TODO(stevenjb): Move this into DBusServices() once the switch is no |
| @@ -733,9 +730,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| chromeos::MagnificationManager::Shutdown(); |
| - // Let the UserManager unregister itself as an observer of the CrosSettings |
| - // singleton before it is destroyed. |
| + // Let the UserManager and WallpaperManager unregister itself as an observer |
| + // of the CrosSettings singleton before it is destroyed. |
| UserManager::Get()->Shutdown(); |
| + WallpaperManager::Get()->Shutdown(); |
| ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); |
| } |