OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
698 SystemKeyEventListener::Shutdown(); | 698 SystemKeyEventListener::Shutdown(); |
699 #endif | 699 #endif |
700 | 700 |
701 imageburner::BurnManager::Shutdown(); | 701 imageburner::BurnManager::Shutdown(); |
702 CrasAudioHandler::Shutdown(); | 702 CrasAudioHandler::Shutdown(); |
703 | 703 |
704 // Detach D-Bus clients before DBusThreadManager is shut down. | 704 // Detach D-Bus clients before DBusThreadManager is shut down. |
705 power_button_observer_.reset(); | 705 power_button_observer_.reset(); |
706 idle_action_warning_observer_.reset(); | 706 idle_action_warning_observer_.reset(); |
707 | 707 |
708 #if !defined(USE_ATHENA) | |
709 // TODO(oshima): MagnificationManager/WallpaperManager depends on ash. | |
710 // 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.
| |
708 MagnificationManager::Shutdown(); | 711 MagnificationManager::Shutdown(); |
712 #endif | |
713 | |
709 AccessibilityManager::Shutdown(); | 714 AccessibilityManager::Shutdown(); |
710 | 715 |
711 media::SoundsManager::Shutdown(); | 716 media::SoundsManager::Shutdown(); |
712 | 717 |
713 system::StatisticsProvider::GetInstance()->Shutdown(); | 718 system::StatisticsProvider::GetInstance()->Shutdown(); |
714 | 719 |
715 // Let the UserManager and WallpaperManager unregister itself as an observer | 720 // Let the UserManager and WallpaperManager unregister itself as an observer |
716 // of the CrosSettings singleton before it is destroyed. This also ensures | 721 // of the CrosSettings singleton before it is destroyed. This also ensures |
717 // that the UserManager has no URLRequest pending (see | 722 // that the UserManager has no URLRequest pending (see |
718 // http://crbug.com/276659). | 723 // http://crbug.com/276659). |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
756 // Destroy DBus services immediately after threads are stopped. | 761 // Destroy DBus services immediately after threads are stopped. |
757 dbus_services_.reset(); | 762 dbus_services_.reset(); |
758 | 763 |
759 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 764 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
760 | 765 |
761 // Destroy DeviceSettingsService after g_browser_process. | 766 // Destroy DeviceSettingsService after g_browser_process. |
762 DeviceSettingsService::Shutdown(); | 767 DeviceSettingsService::Shutdown(); |
763 } | 768 } |
764 | 769 |
765 } // namespace chromeos | 770 } // namespace chromeos |
OLD | NEW |