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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 CrasAudioHandler::Shutdown(); | 760 CrasAudioHandler::Shutdown(); |
761 | 761 |
762 // Called after | 762 // Called after |
763 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be | 763 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be |
764 // executed after execution of chrome::CloseAsh(), because some | 764 // executed after execution of chrome::CloseAsh(), because some |
765 // parts of WebUI depends on NetworkPortalDetector. | 765 // parts of WebUI depends on NetworkPortalDetector. |
766 NetworkPortalDetector::Shutdown(); | 766 NetworkPortalDetector::Shutdown(); |
767 | 767 |
768 g_browser_process->platform_part()->DestroyChromeUserManager(); | 768 g_browser_process->platform_part()->DestroyChromeUserManager(); |
769 | 769 |
| 770 // Make sure that there is no pending URLRequests. |
| 771 UserSessionManager::GetInstance()->Shutdown(); |
| 772 |
770 g_browser_process->platform_part()->ShutdownSessionManager(); | 773 g_browser_process->platform_part()->ShutdownSessionManager(); |
771 } | 774 } |
772 | 775 |
773 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() { | 776 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() { |
774 // Destroy DBus services immediately after threads are stopped. | 777 // Destroy DBus services immediately after threads are stopped. |
775 dbus_services_.reset(); | 778 dbus_services_.reset(); |
776 | 779 |
777 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 780 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
778 | 781 |
779 // Destroy DeviceSettingsService after g_browser_process. | 782 // Destroy DeviceSettingsService after g_browser_process. |
780 DeviceSettingsService::Shutdown(); | 783 DeviceSettingsService::Shutdown(); |
781 } | 784 } |
782 | 785 |
783 } // namespace chromeos | 786 } // namespace chromeos |
OLD | NEW |