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 77b673060e27db7b27cd330d9a925d61f00252f8..ad621ddd14aeafe7d9c292de84893fe55299d2e3 100644 |
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
| @@ -705,7 +705,12 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| power_button_observer_.reset(); |
| idle_action_warning_observer_.reset(); |
| +#if !defined(USE_ATHENA) |
| + // TODO(oshima): MagnificationManager/WallpaperManager depends on ash. |
| + // crbug.com/408733, crbug.com/408734. |
|
oshima
2014/09/09 06:32:50
can you rebase ?
Dmitry Polukhin
2014/09/10 20:30:23
Done.
|
| MagnificationManager::Shutdown(); |
| +#endif |
| + |
| AccessibilityManager::Shutdown(); |
| media::SoundsManager::Shutdown(); |